diff --git a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
index 18c0604a..dbfee337 100644
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
@@ -165,10 +165,13 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
 
   const handleSelectSignatures = useCallback(
     e => {
-      setSelectedSignatures(e.value);
-      onSelect?.(e.value);
+      if (selectable) {
+        onSelect?.(e.value);
+      } else {
+        setSelectedSignatures(e.value);
+      }
     },
-    [onSelect],
+    [onSelect, selectable],
   );
 
   useHotkey(true, ['a'], handleSelectAll);