diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index c5a7e2f146..2d5aec1c5b 100644
--- a/service/storage_proxy.cc
+++ b/service/storage_proxy.cc
@@ -3434,7 +3434,7 @@ public:
                     _runs.pop_back();
                 }
             }
-            if (_runs.empty() || row_count >= _cmd->row_limit) {
+            if (_runs.empty() || row_count >= _cmd->row_limit || partitions.size() >= _cmd->partition_limit) {
                 ret = reconcilable_result(row_count, std::move(partitions));
             }
             return make_ready_future<std::experimental::optional<reconcilable_result>>(std::move(ret));