diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index e957d1608..995327cf5 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -305,7 +305,8 @@
 
     ptk/WatchEvent
     (watch [_ _ _]
-      (rx/of (dcm/retrieve-comment-threads file-id)
+      (rx/of msg/hide
+             (dcm/retrieve-comment-threads file-id)
              (dwp/initialize-file-persistence file-id)
              (fetch-bundle project-id file-id)))
 
diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index ee75b6f55..4de952879 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -7,7 +7,6 @@
 (ns app.main.ui.workspace
   (:require
    [app.common.data.macros :as dm]
-   [app.main.data.messages :as msg]
    [app.main.data.modal :as modal]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.persistence :as dwp]
@@ -166,9 +165,6 @@
         (st/emit! ::dwp/force-persist
                   (dw/finalize-file project-id file-id))))
 
-    (mf/with-effect []
-      (st/emit! msg/hide))
-
     ;; Set properly the page title
     (mf/with-effect [file-name]
       (when file-name