diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index ecb2ff2bc..bb306c34e 100755
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -7993,7 +7993,8 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
         }
 
         // We don't currently support limit with correlated subquery
-        if (gwi.subQuery && !gwi.correlatedTbNameVec.empty() && csep->hasOrderBy())
+        if (csep->limitNum() != (uint64_t) - 1 &&
+                gwi.subQuery && !gwi.correlatedTbNameVec.empty())
         {
             gwi.fatalParseError = true;
             gwi.parseErrorText = IDBErrorInfo::instance()->errorMsg(ERR_NON_SUPPORT_LIMIT_SUB);