diff --git a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
index 225dde4fd9..93cf6889dd 100644
--- a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
@@ -223,6 +223,7 @@
                 (->> move-stream
                      (rx/tap #(reset! last-point-ref %))
                      ;; When transforming shapes we stop querying the worker
+                     (rx/filter (fn [_] (nil? (mf/ref-val transform-ref))))
                      (rx/merge-map query-point)))
 
                (rx/share)))