diff --git a/sidecar/src/figwheel_sidecar/components/figwheel_server.clj b/sidecar/src/figwheel_sidecar/components/figwheel_server.clj
index 8ea0bb47..1d70c172 100644
--- a/sidecar/src/figwheel_sidecar/components/figwheel_server.clj
+++ b/sidecar/src/figwheel_sidecar/components/figwheel_server.clj
@@ -39,7 +39,7 @@
 
 (defn read-msg [data]
   (try
-    (let [msg (edn/read-string {:readers {'js identity 'object identity}} data)]
+    (let [msg (edn/read-string data)]
       (if (and (map? msg) (:figwheel-event msg)) msg {}))
     (catch Exception e
       (println "Figwheel: message from client couldn't be read!")
diff --git a/support/src/figwheel/client.cljs b/support/src/figwheel/client.cljs
index 25f82074..624cf964 100644
--- a/support/src/figwheel/client.cljs
+++ b/support/src/figwheel/client.cljs
@@ -195,7 +195,10 @@
       (let [sb (js/goog.string.StringBuffer.)]
         (binding [cljs.core/*print-newline* true
                   cljs.core/*print-fn* (fn [x] (.append sb x))]
-          (let [result-value (utils/eval-helper code opts)]
+          (let [result-value (utils/eval-helper code opts)
+                result-value (if-not (string? result-value)
+                               (pr-str result-value)
+                               result-value)]
             (result-handler
              {:status :success
               :out (str sb)