diff --git a/app/portainer/settings/general/open-amt/open-amt.controller.js b/app/portainer/settings/general/open-amt/open-amt.controller.js
index 1e52b5d96..c3b455fca 100644
--- a/app/portainer/settings/general/open-amt/open-amt.controller.js
+++ b/app/portainer/settings/general/open-amt/open-amt.controller.js
@@ -1,7 +1,7 @@
 class OpenAmtController {
   /* @ngInject */
-  constructor($async, $state, OpenAMTService, SettingsService, Notifications) {
-    Object.assign(this, { $async, $state, OpenAMTService, SettingsService, Notifications });
+  constructor($async, $scope, $state, OpenAMTService, SettingsService, Notifications) {
+    Object.assign(this, { $async, $scope, $state, OpenAMTService, SettingsService, Notifications });
 
     this.originalValues = {};
     this.formValues = {
@@ -28,6 +28,13 @@ class OpenAmtController {
     };
 
     this.save = this.save.bind(this);
+    this.onChangeEnableOpenAMT = this.onChangeEnableOpenAMT.bind(this);
+  }
+
+  onChangeEnableOpenAMT(checked) {
+    return this.$scope.$evalAsync(() => {
+      this.formValues.enableOpenAMT = checked;
+    });
   }
 
   isFormChanged() {
diff --git a/app/portainer/settings/general/open-amt/open-amt.html b/app/portainer/settings/general/open-amt/open-amt.html
index 38798fa77..5a9364d2c 100644
--- a/app/portainer/settings/general/open-amt/open-amt.html
+++ b/app/portainer/settings/general/open-amt/open-amt.html
@@ -4,7 +4,7 @@
       <rd-widget-header icon="fa-laptop" title-text="Intel OpenAMT"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal" name="openAMTForm">
-          <por-switch-field ng-model="$ctrl.formValues.enableOpenAMT" label="Enable edge OpenAMT"></por-switch-field>
+          <por-switch-field checked="$ctrl.formValues.enableOpenAMT" label="'Enable edge OpenAMT'" on-change="($ctrl.onChangeEnableOpenAMT)"></por-switch-field>
           <span class="small">
             <p class="text-muted" style="margin-top: 10px;">
               <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
@@ -176,7 +176,7 @@
 
             <div class="form-group">
               <div class="col-sm-12">
-                <por-switch-field ng-model="$ctrl.formValues.useWirelessConfig" label="Wireless Configuration"></por-switch-field>
+                <!-- <por-switch-field checked="$ctrl.formValues.useWirelessConfig" label="'Wireless Configuration'" on-change="$ctrl.onChangeUseWirelessConfig"></por-switch-field> -->
               </div>
             </div>
             <div ng-show="$ctrl.formValues.useWirelessConfig">
diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html
index 9aa3a6df8..313f118b1 100644
--- a/app/portainer/views/settings/settings.html
+++ b/app/portainer/views/settings/settings.html
@@ -184,7 +184,7 @@
 
 <ssl-certificate-settings></ssl-certificate-settings>
 
-<open-amt-settings ng-show="settings.FeatureFlagSettings && settings.FeatureFlagSettings['open-amt']"></open-amt-settings>
+<open-amt-settings ng-if="settings.FeatureFlagSettings && settings.FeatureFlagSettings['open-amt']"></open-amt-settings>
 
 <div class="row">
   <div class="col-sm-12">