diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
index 715eda32303..2b7f6ec9e4c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TypeRepository.java
@@ -265,6 +265,14 @@ public class TypeRepository extends EntityRepository<Type> {
     if (uniqueColumns.size() != columns.size()) {
       throw new IllegalArgumentException("Column names must be unique.");
     }
+    if (columns.size() < tableConfig.getMinColumns()
+        || columns.size() > tableConfig.getMaxColumns()) {
+      throw new IllegalArgumentException(
+          "Custom Property table has invalid value columns size must be between "
+              + tableConfig.getMinColumns()
+              + " and "
+              + tableConfig.getMaxColumns());
+    }
 
     try {
       JsonUtils.validateJsonSchema(config.getConfig(), TableConfig.class);