diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 38b4a95295..300dd3572f 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -515,7 +515,8 @@ class SqlaTable(Model, BaseDatasource):
                 direction = asc if ascending else desc
                 qry = qry.order_by(direction(col))
 
-        qry = qry.limit(row_limit)
+        if row_limit:
+            qry = qry.limit(row_limit)
 
         if is_timeseries and \
                 timeseries_limit and groupby and not time_groupby_inline: