diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 9eb23f1cf..e6fccbb3b 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -330,6 +330,7 @@ dummy:
 #handler_health_mon_check_delay: 10
 #handler_health_osd_check_retries: 40
 #handler_health_osd_check_delay: 30
+#handler_health_osd_check: true
 
 ###################
 # CONFIG OVERRIDE #
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 50bd4b3dd..f20fd3a6c 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -322,6 +322,7 @@ handler_health_mon_check_retries: 5
 handler_health_mon_check_delay: 10
 handler_health_osd_check_retries: 40
 handler_health_osd_check_delay: 30
+handler_health_osd_check: true
 
 ###################
 # CONFIG OVERRIDE #
diff --git a/roles/ceph-common/handlers/validate-osd.yml b/roles/ceph-common/handlers/validate-osd.yml
index b83d0952d..99d1c2f87 100644
--- a/roles/ceph-common/handlers/validate-osd.yml
+++ b/roles/ceph-common/handlers/validate-osd.yml
@@ -17,3 +17,4 @@
   retries: "{{ handler_health_osd_check_retries }}"
   delay: "{{ handler_health_osd_check_delay }}"
   delegate_to: "{{ groups[mon_group_name][0] }}"
+  when: handler_health_osd_check