diff --git a/frontend/src/app/main/data/workspace/comments.cljs b/frontend/src/app/main/data/workspace/comments.cljs
index 71601e7b8a..a617753fa3 100644
--- a/frontend/src/app/main/data/workspace/comments.cljs
+++ b/frontend/src/app/main/data/workspace/comments.cljs
@@ -274,7 +274,8 @@
   (ptk/reify ::navigate-to-comment-id
     ptk/WatchEvent
     (watch [_ state _]
-      (let [file-id (:current-file-id state)]
+      (if-let [file-id (:current-file-id state)]
         (->> (rp/cmd! :get-comment-threads {:file-id file-id})
              (rx/map #(d/seek (fn [{:keys [id]}] (= thread-id id)) %))
-             (rx/map navigate-to-comment))))))
+             (rx/map navigate-to-comment))
+        (rx/empty)))))