diff --git a/webapp/controller/OtherController.class.php b/webapp/controller/OtherController.class.php
index 6131b131..d8c420e3 100644
--- a/webapp/controller/OtherController.class.php
+++ b/webapp/controller/OtherController.class.php
@@ -387,9 +387,10 @@ class OtherController extends BaseAuthedController {
 
                 $isOpen = mt\MapMode::isOpen($modeMeta);
                 if ($isOpen) {
-                    if ($modeMeta['mapMode'] == \mt\MapMode::CIRCUIT_MODE &&
-                        myself()->_switchIsOpen('circuitMatch')){
-                        array_unshift($modeList,$temp);
+                    if ($modeMeta['mapMode'] == \mt\MapMode::CIRCUIT_MODE){
+                        if (myself()->_switchIsOpen('circuitMatch')) {
+                            array_unshift($modeList,$temp);
+                        }
                     }else{
                         array_push($modeList, $temp);
                     }