diff --git a/common/src/app/common/data/macros.cljc b/common/src/app/common/data/macros.cljc
index 4c8ff9a6c9..0bb74e204e 100644
--- a/common/src/app/common/data/macros.cljc
+++ b/common/src/app/common/data/macros.cljc
@@ -121,7 +121,7 @@
   directly on CLJS, on CLJ works as get."
   [obj prop]
   (if (:ns &env)
-    (list 'js* (c/str "(~{}?." (str/snake prop) ")") obj)
+    (list 'js* (c/str "(~{}?." (str/snake prop) "?? ~{})") obj (list 'cljs.core/get obj prop))
     (list `c/get obj prop)))
 
 (def ^:dynamic *assert-context* nil)