diff --git a/forward_engineering/hiveHelpers/helpers/constraintHelper.js b/forward_engineering/hiveHelpers/helpers/constraintHelper.js
index bc3d303..a1559f3 100644
--- a/forward_engineering/hiveHelpers/helpers/constraintHelper.js
+++ b/forward_engineering/hiveHelpers/helpers/constraintHelper.js
@@ -112,8 +112,8 @@ const getCompositePrimaryKeys = ({ jsonSchema }) => {
 		.filter(primaryKey => primaryKey.compositePrimaryKey?.length)
 		.map(primaryKey => ({
 			keyType: 'PRIMARY KEY',
-			name: prepareName(primaryKey.constraintName),
 			columns: getKeys(primaryKey.compositePrimaryKey, jsonSchema),
+			...(primaryKey.constraintName && { name: prepareName(primaryKey.constraintName) }),
 		}));
 };
 
@@ -130,8 +130,8 @@ const getCompositeUniqueKeys = ({ jsonSchema }) => {
 		.filter(uniqueKey => uniqueKey.compositeUniqueKey?.length)
 		.map(uniqueKey => ({
 			keyType: 'UNIQUE',
-			name: prepareName(uniqueKey.constraintName),
 			columns: getKeys(uniqueKey.compositeUniqueKey, jsonSchema),
+			...(uniqueKey.constraintName && { name: prepareName(uniqueKey.constraintName) }),
 		}));
 };
 
diff --git a/forward_engineering/hiveHelpers/helpers/generalHelper.js b/forward_engineering/hiveHelpers/helpers/generalHelper.js
index 47752a8..26a90c7 100644
--- a/forward_engineering/hiveHelpers/helpers/generalHelper.js
+++ b/forward_engineering/hiveHelpers/helpers/generalHelper.js
@@ -42,11 +42,7 @@ const checkNameNeedBackticks = name => !/^\w*$/.test(name) || name.startsWith('_
 
 const isReserved = name => RESERVED_WORDS.includes(name.toLowerCase());
 
-const prepareName = name => {
-	if (!name) {
-		return;
-	}
-
+const prepareName = (name = '') => {
 	if ((checkNameNeedBackticks(name) && !isEscaped(name)) || isReserved(name)) {
 		return `\`${name}\``;
 	}