diff --git a/templates/hostapd.php b/templates/hostapd.php
index 316220ac..fd1c9551 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -131,7 +131,7 @@
                   if ($arrHostapdConf['WifiAPEnable'] == 1) {
                       $checkedWifiAPEnabled = ' checked="checked"';
 		  }
-		  if ($managedModeEnabled == false) {
+		  if ($managedModeEnabled == false && $arrHostapdConf['WifiAPEnable'] != 1) {
                       $wifiAPToggle = "disabled";
 		      $wifiAPHelp = "Managed mode not enabled";
                   }