diff --git a/client/public/stylesheets/style/style.css b/client/public/stylesheets/style/style.css
index 5eb11f5b..1bd3c351 100644
--- a/client/public/stylesheets/style/style.css
+++ b/client/public/stylesheets/style/style.css
@@ -1469,6 +1469,10 @@ input[type=number]::-webkit-outer-spin-button {
 	background-color: var(--ol-switch-off);
 }
 
+.switch-control.yes-no .ol-switch[data-value="undefined"] .ol-switch-fill {
+	background-color: var(--ol-switch-undefined);
+}
+
 .switch-control.coalition .ol-switch>.ol-switch-fill::before,
 .switch-control.yes-no .ol-switch>.ol-switch-fill::before {
     translate:-100% 0;
@@ -1484,13 +1488,17 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .switch-control.coalition [data-value="true"] .ol-switch-fill {
-	background-color: var(--accent-light-blue);
+	background-color: var(--primary-blue);
 }
 
 .switch-control.coalition [data-value="false"] .ol-switch-fill {
 	background-color: var(--primary-red);
 }
 
+.switch-control.coalition [data-value="undefined"] .ol-switch-fill {
+	background-color: var(--ol-switch-undefined);
+}
+
 .switch-control.coalition [data-value="true"]>.ol-switch-fill::before {
 	content: "BLUE" !important;
 }
diff --git a/client/public/themes/olympus/theme.css b/client/public/themes/olympus/theme.css
index b086467c..2da7dde9 100644
--- a/client/public/themes/olympus/theme.css
+++ b/client/public/themes/olympus/theme.css
@@ -46,6 +46,7 @@
 
     --ol-select-secondary: #545F6C;
     --ol-switch-off:#686868;
+    --ol-switch-undefined:#383838;
 
     /*** General border radii  **/
     --border-radius-xs: 2px;
diff --git a/client/src/unit/unitsmanager.ts b/client/src/unit/unitsmanager.ts
index f2168c7a..da0cd331 100644
--- a/client/src/unit/unitsmanager.ts
+++ b/client/src/unit/unitsmanager.ts
@@ -325,7 +325,7 @@ export class UnitsManager {
         var value: any = variableGetter(units[0]);
         units.forEach((unit: Unit) => {
             if (variableGetter(unit) !== value)
-                return undefined;
+                value = undefined;
         });
         return value;
     };