diff --git a/src/messenger/persistence/realm.cljs b/src/messenger/persistence/realm.cljs
index d0bdc5ebe5..ea72c9b561 100644
--- a/src/messenger/persistence/realm.cljs
+++ b/src/messenger/persistence/realm.cljs
@@ -55,8 +55,8 @@
   (-> (aget result 0)))
 
 (defn single-cljs [result]
-  (-> (aget result 0)
-      (js->clj :keywordize-keys true)))
+  (some-> (aget result 0)
+          (js->clj :keywordize-keys true)))
 
 (defn decode-value [{:keys [key value]}]
   (read-string value))
diff --git a/src/messenger/persistence/simple_kv_store.cljs b/src/messenger/persistence/simple_kv_store.cljs
index ca74bd01a8..fcddc6d3d5 100644
--- a/src/messenger/persistence/simple_kv_store.cljs
+++ b/src/messenger/persistence/simple_kv_store.cljs
@@ -10,9 +10,9 @@
         (r/create :kv-store {:key   key
                              :value (str value)} true))))
   (get [_ key]
-    (-> (r/get-by-field :kv-store :key key)
-        (r/single-cljs)
-        (r/decode-value)))
+    (some-> (r/get-by-field :kv-store :key key)
+            (r/single-cljs)
+            (r/decode-value)))
   (contains-key? [_ key]
     (= 0
        (.-length (r/get-by-field :kv-store :key key))))
@@ -23,4 +23,4 @@
 
 (comment
 
-    )
\ No newline at end of file
+  )
\ No newline at end of file