diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
index 9a1c5531f..48315ed3f 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
@@ -490,8 +490,9 @@
          (mf/deps current-component-id)
          (fn [new-name]
            (swap! state* dissoc :renaming)
-           (st/emit!
-            (dwl/rename-component-and-main-instance current-component-id new-name))))
+           (when (not (str/blank? new-name))
+             (st/emit!
+              (dwl/rename-component-and-main-instance current-component-id new-name)))))
 
         on-context-menu
         (mf/use-fn