diff --git a/application/src/main/data/upgrade/basic/schema_update.sql b/application/src/main/data/upgrade/basic/schema_update.sql
index 9aec87af00..ebe63a6b3a 100644
--- a/application/src/main/data/upgrade/basic/schema_update.sql
+++ b/application/src/main/data/upgrade/basic/schema_update.sql
@@ -193,6 +193,17 @@ $$
     END;
 $$;
 
+-- update constraint name
+DO
+$$
+    BEGIN
+        ALTER TABLE domain DROP CONSTRAINT IF EXISTS domain_unq_key;
+        IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'domain_name_key') THEN
+            ALTER TABLE domain ADD CONSTRAINT domain_name_key UNIQUE (name);
+        END IF;
+    END;
+$$;
+
 -- UPDATE RESOURCE JS_MODULE SUB TYPE START
 
 UPDATE resource SET resource_sub_type = 'EXTENSION' WHERE resource_type = 'JS_MODULE' AND resource_sub_type IS NULL;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java
index d349d2d59b..1582d634b2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java
@@ -67,7 +67,7 @@ public class DomainServiceImpl extends AbstractEntityService implements DomainSe
             return savedDomain;
         } catch (Exception e) {
             checkConstraintViolation(e,
-                    Map.of("domain_unq_key", "Domain with such name and scheme already exists!"));
+                    Map.of("domain_name_key", "Domain with such name and scheme already exists!"));
             throw e;
         }
     }