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