diff --git a/backend/src/app/rpc.clj b/backend/src/app/rpc.clj
index dd7a309ef..b0a44367d 100644
--- a/backend/src/app/rpc.clj
+++ b/backend/src/app/rpc.clj
@@ -344,6 +344,7 @@
           'app.rpc.commands.search
           'app.rpc.commands.teams
           'app.rpc.commands.verify-token
+          'app.rpc.commands.viewer
           'app.rpc.commands.webhooks)
          (map (partial process-method cfg))
          (into {}))))
diff --git a/backend/src/app/rpc/commands/viewer.clj b/backend/src/app/rpc/commands/viewer.clj
index c19e84824..e9c1b0086 100644
--- a/backend/src/app/rpc/commands/viewer.clj
+++ b/backend/src/app/rpc/commands/viewer.clj
@@ -84,6 +84,6 @@
    ::cond/key-fn files/get-file-etag
    ::cond/reuse-key? true
    ::doc/added "1.17"}
-  [{:keys [pool]} {:keys [::rpc/profile-id] :as params}]
+  [{:keys [::db/pool]} {:keys [::rpc/profile-id] :as params}]
   (with-open [conn (db/open pool)]
     (get-view-only-bundle conn (assoc params :profile-id profile-id))))
diff --git a/backend/src/app/rpc/queries/viewer.clj b/backend/src/app/rpc/queries/viewer.clj
index 837dab94f..14a016096 100644
--- a/backend/src/app/rpc/queries/viewer.clj
+++ b/backend/src/app/rpc/queries/viewer.clj
@@ -22,7 +22,7 @@
 (sv/defmethod ::view-only-bundle
   {::rpc/auth false
    ::doc/added "1.3"
-   ::doc/deprecated "1.17"}
+   ::doc/deprecated "1.18"}
   [{:keys [pool] :as cfg} {:keys [features components-v2] :as params}]
   (with-open [conn (db/open pool)]
     (let [;; BACKWARD COMPATIBILTY with the components-v2 parameter
diff --git a/frontend/src/app/main/data/viewer.cljs b/frontend/src/app/main/data/viewer.cljs
index 4ae8f1263..9213cd938 100644
--- a/frontend/src/app/main/data/viewer.cljs
+++ b/frontend/src/app/main/data/viewer.cljs
@@ -129,22 +129,22 @@
                               (rx/map :content)
                               (rx/map #(vector key %)))))]
 
-        (->> (rp/query! :view-only-bundle params')
-               (rx/mapcat
-                (fn [bundle]
-                  (->> (rx/from (-> bundle :file :data :pages-index seq))
-                       (rx/merge-map
-                        (fn [[_ page :as kp]]
-                          (if (t/pointer? page)
-                            (resolve kp)
-                            (rx/of kp))))
-                       (rx/reduce conj {})
-                       (rx/map (fn [pages-index]
-                                 (update-in bundle [:file :data] assoc :pages-index pages-index))))))
-               (rx/mapcat
-                (fn [{:keys [fonts] :as bundle}]
-                  (rx/of (df/fonts-fetched fonts)
-                         (bundle-fetched (merge bundle params))))))))))
+        (->> (rp/cmd! :get-view-only-bundle params')
+             (rx/mapcat
+              (fn [bundle]
+                (->> (rx/from (-> bundle :file :data :pages-index seq))
+                     (rx/merge-map
+                      (fn [[_ page :as kp]]
+                        (if (t/pointer? page)
+                          (resolve kp)
+                          (rx/of kp))))
+                     (rx/reduce conj {})
+                     (rx/map (fn [pages-index]
+                               (update-in bundle [:file :data] assoc :pages-index pages-index))))))
+             (rx/mapcat
+              (fn [{:keys [fonts] :as bundle}]
+                (rx/of (df/fonts-fetched fonts)
+                       (bundle-fetched (merge bundle params))))))))))
 
 (declare go-to-frame-auto)
 
diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs
index f1bd5530e..320f5a682 100644
--- a/frontend/src/app/main/repo.cljs
+++ b/frontend/src/app/main/repo.cljs
@@ -13,6 +13,7 @@
    [beicon.core :as rx]))
 
 (derive :get-all-projects ::query)
+(derive :get-comment-threads ::query)
 (derive :get-file ::query)
 (derive :get-file-fragment ::query)
 (derive :get-file-libraries ::query)
@@ -26,6 +27,7 @@
 (derive :get-team-stats ::query)
 (derive :get-team-users ::query)
 (derive :get-teams ::query)
+(derive :get-view-only-bundle ::query)
 (derive :search-files ::query)
 
 (defn handle-response