diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
index 3575ba1109..3b92d53883 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
@@ -52,7 +52,7 @@ public class DefaultTbTenantService extends AbstractTbEntityService implements T
         boolean created = tenant.getId() == null;
         Tenant oldTenant = !created ? tenantService.findTenantById(tenant.getId()) : null;
 
-        Tenant savedTenant = checkNotNull(tenantService.saveTenant(tenant, false));
+        Tenant savedTenant = checkNotNull(tenantService.saveTenant(tenant, !created));
         if (created) {
             installScripts.createDefaultRuleChains(savedTenant.getId());
             installScripts.createDefaultEdgeRuleChains(savedTenant.getId());
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
index 0bb0dbf50e..cccf54d10a 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
@@ -49,10 +49,10 @@ public interface DeviceService extends EntityDaoService {
 
     Device findDeviceByTenantIdAndName(TenantId tenantId, String name);
 
-    Device saveDevice(Device device, boolean doValidate);
-
     Device saveDevice(Device device);
 
+    Device saveDevice(Device device, boolean doValidate);
+
     Device saveDeviceWithAccessToken(Device device, String accessToken);
 
     Device saveDeviceWithCredentials(Device device, DeviceCredentials deviceCredentials);