diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index d3f43d0396..13c74a91bc 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -97,10 +97,11 @@
                              (mf/deps selected-shapes token-type-props)
                              (fn [event token]
                                (dom/stop-propagation event)
-                               (st/emit!
-                                (wtc/toggle-token {:token token
-                                                   :shapes selected-shapes
-                                                   :token-type-props token-type-props}))))
+                               (when (seq selected-shapes)
+                                 (st/emit!
+                                  (wtc/toggle-token {:token token
+                                                     :shapes selected-shapes
+                                                     :token-type-props token-type-props})))))
         tokens-count (count tokens)]
     [:div {:on-click on-toggle-open-click}
      [:& cmm/asset-section {:icon (mf/fnc icon-wrapper [_]