diff --git a/openwisp_controller/config/controller/views.py b/openwisp_controller/config/controller/views.py
index 94a6faab6..dfbcc40ec 100644
--- a/openwisp_controller/config/controller/views.py
+++ b/openwisp_controller/config/controller/views.py
@@ -280,6 +280,8 @@ def init_object(self, **kwargs):
         config_model = device_model.get_config_model()
         options = {}
         for attr in kwargs.keys():
+            if attr in ['organization', 'organization_id']:
+                continue
             # skip attributes that are not model fields
             try:
                 device_model._meta.get_field(attr)
diff --git a/openwisp_controller/config/tests/test_controller.py b/openwisp_controller/config/tests/test_controller.py
index 66fe31b77..a82a27361 100644
--- a/openwisp_controller/config/tests/test_controller.py
+++ b/openwisp_controller/config/tests/test_controller.py
@@ -36,6 +36,7 @@
 Vpn = load_model('config', 'Vpn')
 Ca = load_model('django_x509', 'Ca')
 OrganizationConfigSettings = load_model('config', 'OrganizationConfigSettings')
+Organization = load_model('openwisp_users', 'Organization')
 
 
 class TestController(
@@ -430,6 +431,20 @@ def test_register(self, **kwargs):
     def test_register_with_management_ip(self):
         self.test_register(management_ip='10.0.0.2')
 
+    def test_register_with_org_id(self):
+        org1 = self._get_org()
+        org2 = Organization.objects.create(name='org2', slug='org2')
+        device = self.test_register(organization_id=str(org2.id))
+        self.assertEqual(device.organization, org1)
+        self.assertNotEqual(device.organization, org2)
+
+    def test_register_with_org_param(self):
+        org1 = self._get_org()
+        org2 = Organization.objects.create(name='org2', slug='org2')
+        device = self.test_register(organization=str(org2.id))
+        self.assertEqual(device.organization, org1)
+        self.assertNotEqual(device.organization, org2)
+
     def test_register_exceeds_org_device_limit(self):
         org = self._get_org()
         org.config_limits.device_limit = 1