diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index f8aa444d9eb94d2eedfa268c45fb0da13363f77e..50ae545a8ea73ace85821e1b82f816cab9cee826 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5648,11 +5648,17 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
     tVariantListItem* p0 = taosArrayGet(pKeep, 0);
     switch (s) {
       case 1: {
+        if ((int32_t)p0->pVar.i64 <= 0) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+        }
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
       }
         break;
       case 2: {
         tVariantListItem* p1 = taosArrayGet(pKeep, 1);
+        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+        }        
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
         pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
         break;
@@ -5661,6 +5667,10 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
         tVariantListItem* p1 = taosArrayGet(pKeep, 1);
         tVariantListItem* p2 = taosArrayGet(pKeep, 2);
 
+        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0 || (int32_t)p2->pVar.i64 <= 0) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+        } 
+
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
         pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
         pMsg->daysToKeep2 = htonl((int32_t)p2->pVar.i64);
diff --git a/tests/script/general/db/alter_option.sim b/tests/script/general/db/alter_option.sim
index 170ba21c28b7ff4a79a8f2375dc1d36ba91e6120..c3bb23855fceb877c1ed39c01524231d27edb4f4 100644
--- a/tests/script/general/db/alter_option.sim
+++ b/tests/script/general/db/alter_option.sim
@@ -129,8 +129,8 @@ sql alter database db keep 20
 sql_error alter database db keep 10
 sql_error alter database db keep 9
 sql_error alter database db keep 1
-sql alter database db keep 0
-sql alter database db keep -1
+sql_error alter database db keep 0
+sql_error alter database db keep -1
 sql_error alter database db keep 365001
 
 print ============== step cache
diff --git a/tests/script/general/db/topic1.sim b/tests/script/general/db/topic1.sim
index 42613405afda7580003f58ae82f950880d60de62..2b4cce5e64bf7076eeb2f0f0e3c1dfbaa224b116 100644
--- a/tests/script/general/db/topic1.sim
+++ b/tests/script/general/db/topic1.sim
@@ -385,8 +385,8 @@ sql alter database db keep 20
 sql_error alter database db keep 10
 sql_error alter database db keep 9
 sql_error alter database db keep 1
-sql alter database db keep 0
-sql alter database db keep -1
+sql_error alter database db keep 0
+sql_error alter database db keep -1
 sql_error alter database db keep 365001
 
 sql_error alter topic db keep 40