diff --git a/common/src/app/common/types/shape/radius.cljc b/common/src/app/common/types/shape/radius.cljc
index 415dd4c93e..3edb18cd0b 100644
--- a/common/src/app/common/types/shape/radius.cljc
+++ b/common/src/app/common/types/shape/radius.cljc
@@ -51,19 +51,14 @@
 (defn switch-to-radius-1
   [shape]
   (let [r (if (all-equal? shape) (:r1 shape) 0)]
-    (cond-> shape
-      (:r1 shape)
-      (-> (assoc :rx r :ry r)
-          (dissoc :r1 :r2 :r3 :r4)))))
+    (-> shape
+        (assoc :rx r :ry r)
+        (dissoc :r1 :r2 :r3 :r4))))
 
 (defn switch-to-radius-4
   [shape]
-  (cond-> shape
-    (:rx shape)
-    (-> (assoc :r1 (:rx shape)
-               :r2 (:rx shape)
-               :r3 (:rx shape)
-               :r4 (:rx shape))
+  (let [rx (:rx shape 0)]
+    (-> (assoc shape :r1 rx :r2 rx :r3 rx :r4 rx)
         (dissoc :rx :ry))))
 
 (defn set-radius-1
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
index f06a409235..9761d869a7 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
@@ -207,7 +207,7 @@
 
         on-switch-to-radius-1
         (mf/use-callback
-         (mf/deps ids)
+         (mf/deps ids change-radius)
          (fn [_value]
            (if all-equal?
              (st/emit! (change-radius ctsr/switch-to-radius-1))
@@ -215,20 +215,20 @@
 
         on-switch-to-radius-4
         (mf/use-callback
-         (mf/deps ids)
+         (mf/deps ids change-radius)
          (fn [_value]
            (st/emit! (change-radius ctsr/switch-to-radius-4))
            (reset! radius-multi? false)))
 
         on-radius-1-change
         (mf/use-callback
-         (mf/deps ids)
+         (mf/deps ids change-radius)
          (fn [value]
            (st/emit! (change-radius #(ctsr/set-radius-1 % value)))))
 
         on-radius-multi-change
         (mf/use-callback
-         (mf/deps ids)
+         (mf/deps ids change-radius)
          (fn [event]
            (let [value (-> event dom/get-target dom/get-value d/parse-integer)]
              (when (some? value)
@@ -238,7 +238,7 @@
 
         on-radius-4-change
         (mf/use-callback
-         (mf/deps ids)
+         (mf/deps ids change-radius)
          (fn [value attr]
            (st/emit! (change-radius #(ctsr/set-radius-4 % attr value)))))