diff --git a/dbcon/ddlpackageproc/altertableprocessor.cpp b/dbcon/ddlpackageproc/altertableprocessor.cpp
index 3c337afd8..01ad0466c 100644
--- a/dbcon/ddlpackageproc/altertableprocessor.cpp
+++ b/dbcon/ddlpackageproc/altertableprocessor.cpp
@@ -678,10 +678,14 @@ AlterTableProcessor::DDLResult AlterTableProcessor::processPackageInternal(
 
 bool AlterTableProcessor::tableTooBig(ddlpackage::QualifiedName& fTableNam)
 {
-  //check fi there are more thank 500 rows
+  //check fi there are more thank MAX BATCH SIZE rows
   DMLTable tableProc;
   tableProc.set_TableName(fTableNam.fName);
-  if(tableProc.get_RowList().size() > 500)
+  string maxRowSizeAlterString;
+  config::Config* config = config::Config::makeConfig();
+  maxRowSizeAlterString = config->getConfig("SystemConfig", "MaxRowSizeAlter");
+  uint64_t maxRowSizeAlter = config::Config::uFromText(maxRowSizeAlterString);
+  if(tableProc.get_RowList().size() > maxRowSizeAlter)
   {
     return true;
   }
diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml
index 23795f805..82b6fe6bc 100644
--- a/oam/etc/Columnstore.xml
+++ b/oam/etc/Columnstore.xml
@@ -70,6 +70,8 @@
 			the entire subdirectories "joins" & "aggregates" and recreates it to make sure no
 			files are left behind. -->
 		<SystemTempFileDir>/tmp/columnstore_tmp_files</SystemTempFileDir>
+		<!-- Maximum row size of a table for which ALTER TABLE statements are allowed-->
+		<MaxRowSizeAlter>500</MaxRowSizeAlter>
 	</SystemConfig>
 	<SystemModuleConfig>
 		<ModuleType2>um</ModuleType2>