diff --git a/lib/shared/addon/components/cluster-driver/driver-aks/component.js b/lib/shared/addon/components/cluster-driver/driver-aks/component.js
index 6c7124097..5c7a9a2c4 100644
--- a/lib/shared/addon/components/cluster-driver/driver-aks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-aks/component.js
@@ -321,6 +321,10 @@ export default Component.extend(ClusterDriver, {
     if (networkPlugin === 'kubenet' && networkPolicy === 'azure') {
       set(this, 'config.networkPolicy', null);
     }
+
+    if (this.config.networkPolicy === null) {
+      set(this, 'cluster.enableNetworkPolicy', false)
+    }
   }),
 
   resetIpRanges: observer('config.privateCluster', 'loadBalancerSku', function() {
diff --git a/lib/shared/addon/components/cluster-driver/driver-aks/template.hbs b/lib/shared/addon/components/cluster-driver/driver-aks/template.hbs
index a8a216d81..3604e18dc 100644
--- a/lib/shared/addon/components/cluster-driver/driver-aks/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-aks/template.hbs
@@ -562,7 +562,7 @@
                     <Input
                       @type="checkbox"
                       @checked={{mut cluster.enableNetworkPolicy}}
-                      @disabled={{editing}}
+                      @disabled={{or editing (not config.networkPolicy)}}
                     />
                     {{t "clusterNew.rke.networkPolicy.label"}}
                     {{#if editing}}
@@ -571,11 +571,20 @@
                         @model={{t "clusterNew.rke.networkPolicy.editHelp"}}
                         @tooltipTemplate="tooltip-static"
                         @aria-describedby="tooltip-base"
-                        @tooltipFor="tooltipNetworkPolicy"
                         @placement="top"
                       >
                         <i class="acc-label icon icon-info"></i>
                       </TooltipElement>
+                    {{else if (not config.networkPolicy)}}
+                      <TooltipElement
+                          @type="tooltip-basic"
+                          @model={{t "clusterNew.rke.networkPolicy.selectNetworkPolicyHelp"}}
+                          @tooltipTemplate="tooltip-static"
+                          @aria-describedby="tooltip-base"
+                          @placement="top"
+                        >
+                          <i class="acc-label icon icon-info"></i>
+                        </TooltipElement>
                     {{/if}}
                   </label>
                 </div>
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 8e7e18722..680dad7f1 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -4649,6 +4649,7 @@ clusterNew:
     networkPolicy:
       label: Project Network Isolation
       editHelp: The Project Network Isolation option cannot be changed after the cluster is created
+      selectNetworkPolicyHelp: You must have a Network Policy selected to use Project Network Isolation 
     nodeName:
       detail: Optionally configure the node name as identification instead of the actual hostname
       placeholder: e.g. my-worker-node