diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java
index b3541ed9..19e91265 100644
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java
@@ -76,9 +76,11 @@ public class CommonCodeCoreService
                           "parent id 를 찾을 수 없습니다. id : " + req.getParentId()));
 
       entity.addParent(parentCommonCodeEntity);
+    } else {
+      entity.addParent(null);
     }
-
     commonCodeRepository.save(entity).toDto();
+
     return new ResponseObj(ApiResponseCode.OK, "");
   }
 
diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java
index 2557240d..4298eedd 100644
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/code/CommonCodeRepositoryImpl.java
@@ -4,6 +4,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QCommonCodeEntity.commonCod
 
 import com.kamco.cd.kamcoback.postgres.entity.CommonCodeEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QCommonCodeEntity;
+import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import java.util.Optional;
@@ -106,10 +107,16 @@ public class CommonCodeRepositoryImpl implements CommonCodeRepositoryCustom {
     return queryFactory
         .select(commonCodeEntity.code.count())
         .from(commonCodeEntity)
-        .where(commonCodeEntity.parent.id.eq(parentId), commonCodeEntity.code.eq(code))
+        .where(conditionParentId(parentId), commonCodeEntity.code.eq(code))
         .fetchOne();
   }
 
+  private BooleanExpression conditionParentId(Long parentId) {
+    return parentId == null
+        ? commonCodeEntity.parent.id.isNull()
+        : commonCodeEntity.parent.id.eq(parentId);
+  }
+
   private List<CommonCodeEntity> findAllByIds(Set<Long> ids) {
     return queryFactory
         .selectFrom(commonCodeEntity)