diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index be926dfd36c..c021beb470b 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -1,5 +1,5 @@
 {% set heapster_memory = "300Mi" -%}
-{% if pillar['num_nodes'] is defined -%}
+{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
   {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
 {% endif -%}
 
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index 78637d8bbc8..9b9a15900b9 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -1,5 +1,5 @@
 {% set heapster_memory = "300Mi" -%}
-{% if pillar['num_nodes'] is defined -%}
+{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
   {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
 {% endif -%}
 
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index 5d1766260f3..63335ebed7f 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -1,5 +1,5 @@
 {% set heapster_memory = "300Mi" -%}
-{% if pillar['num_nodes'] is defined -%}
+{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
   {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
 {% endif -%}
 
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 6600dacb129..cf88dfbdbb0 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -1,5 +1,5 @@
 {% set heapster_memory = "300Mi" -%}
-{% if pillar['num_nodes'] is defined -%}
+{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
   {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
 {% endif -%}