diff --git a/web/pgadmin/static/js/validators.js b/web/pgadmin/static/js/validators.js
index 2dc1cde43..25455d4ba 100644
--- a/web/pgadmin/static/js/validators.js
+++ b/web/pgadmin/static/js/validators.js
@@ -16,7 +16,7 @@ export function minMaxValidator(label, value, minValue, maxValue) {
   if((_.isUndefined(value) || _.isNull(value) || String(value) === ''))
     return null;
 
-  if(isNaN(minValue) || isNaN(maxValue)) {
+  if((!_.isUndefined(minValue) && isNaN(minValue)) || (!_.isUndefined(maxValue) && isNaN(maxValue))) {
     return pgAdmin.Browser.messages.INVALID_MIN_MAX;
   } else if (!_.isUndefined(minValue) && (value < minValue || value === '-')) {
     return sprintf(pgAdmin.Browser.messages.MUST_GR_EQ, label, minValue);
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSetToolbar.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSetToolbar.jsx
index 558b57c82..c11c16d21 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSetToolbar.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSetToolbar.jsx
@@ -443,9 +443,10 @@ export function ResultSetToolbar({query, canEdit, totalRowCount, pagination, all
             )
           }
         </Box>
+        {totalRowCount > 0 &&
         <Box>
           <PaginationInputs key={JSON.stringify(pagination)} pagination={pagination} totalRowCount={totalRowCount} clearSelection={clearSelection} />
-        </Box>
+        </Box>}
       </StyledDiv>
       <PgMenu
         anchorRef={copyMenuRef}