diff --git a/common/src/app/common/data.cljc b/common/src/app/common/data.cljc
index d814b1439..c01cdb3d6 100644
--- a/common/src/app/common/data.cljc
+++ b/common/src/app/common/data.cljc
@@ -216,12 +216,19 @@
   [coll]
   (into [] (remove nil?) coll))
 
+
 (defn without-nils
   "Given a map, return a map removing key-value
   pairs when value is `nil`."
-  ([] (remove (comp nil? val)))
+  ([]
+   (remove (comp nil? val)))
   ([data]
-   (into {} (without-nils) data)))
+   (reduce-kv (fn [data k v]
+                (if (nil? v)
+                  (dissoc data k)
+                  data))
+              data
+              data)))
 
 (defn without-qualified
   ([]
diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc
index 28289219d..2397d5845 100644
--- a/common/src/app/common/types/shape.cljc
+++ b/common/src/app/common/types/shape.cljc
@@ -491,7 +491,12 @@
   the shape. The props must have :x :y :width :height."
   [{:keys [type] :as props}]
   (let [shape (make-minimal-shape type)
-        shape (merge shape (d/without-nils props))
+
+        ;; The props can be custom records that does not
+        ;; work properly with without-nils, so we first make
+        ;; it plain map for proceed
+        props (d/without-nils (into {} props))
+        shape (merge shape (d/without-nils (into {} props)))
         shape (case (:type shape)
                 (:bool :path)  (setup-path shape)
                 :image (-> shape setup-rect setup-image)