diff --git a/src/main/frontend/worker/rtc/crypt.cljs b/src/main/frontend/worker/rtc/crypt.cljs
index 783cf1e30b..73c5304bb6 100644
--- a/src/main/frontend/worker/rtc/crypt.cljs
+++ b/src/main/frontend/worker/rtc/crypt.cljs
@@ -145,8 +145,9 @@
     (let [{:keys [get-ws-create-task]} (ws-util/gen-get-ws-create-map--memoized (ws-util/get-ws-url token))
           {:keys [public-key encrypted-private-key]}
           (m/? (task--fetch-user-rsa-key-pair get-ws-create-task user-uuid))]
-      {:public-key (c.m/<? (crypt/<export-public-key public-key))
-       :encrypted-private-key encrypted-private-key})))
+      (when (and public-key encrypted-private-key)
+        {:public-key (c.m/<? (crypt/<export-public-key public-key))
+         :encrypted-private-key encrypted-private-key}))))
 
 (def-thread-api :thread-api/throw-ex-test
   []