diff --git a/ceph/meta/grafana.yml b/ceph/meta/grafana.yml
index 5009ec7..8f4e7e0 100644
--- a/ceph/meta/grafana.yml
+++ b/ceph/meta/grafana.yml
@@ -48,7 +48,7 @@
     datasource: prometheus
     format: json
     template: ceph/files/grafana_dashboards/{{ common.version }}-radosgw-detail_prometheus.json
-    {%- if common.version in ['nautilus']%}
+    {%- if common.version in ['nautilus'] and common.get('rbd_monitoring_enabled', False) %}
   ceph_rbd_overview_prometheus:
     datasource: prometheus
     format: json
diff --git a/ceph/mgr.sls b/ceph/mgr.sls
index 9aa1799..c30cb7d 100644
--- a/ceph/mgr.sls
+++ b/ceph/mgr.sls
@@ -128,7 +128,7 @@
 {%- if common.version not in ['jewel','kraken','luminous'] and setup.pool is defined %}
   {%- set rbd_pools=[] %}
     {%- for pool_name, pool in setup.pool.iteritems() %}
-      {%- if pool.application == 'rbd' and pool.rbd_stats == true %}
+      {%- if pool.application == 'rbd' and pool.get('rbd_stats', False) %}
         {%- do rbd_pools.append(pool_name) %}
       {%- endif %}
     {%- endfor %}