diff --git a/roles/ceph-handler/tasks/main.yml b/roles/ceph-handler/tasks/main.yml
index c7b323e78..099ad3b30 100644
--- a/roles/ceph-handler/tasks/main.yml
+++ b/roles/ceph-handler/tasks/main.yml
@@ -68,4 +68,10 @@
       import_role:
         name: ceph-rgw
         tasks_from: multisite.yml
-      when: rgw_multisite | bool
+      when:
+        - rgw_multisite | bool
+        - not multisite_called_from_handler_role | default(False) | bool
+
+    - name: set_fact multisite_called_from_handler_role
+      set_fact:
+        multisite_called_from_handler_role: true
diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index a3e4b84a0..5811115b1 100644
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -29,4 +29,6 @@
 
 - name: include_tasks multisite/main.yml
   include_tasks: multisite/main.yml
-  when: rgw_multisite | bool
+  when:
+    - rgw_multisite | bool
+    - not multisite_called_from_handler_role | default(False) | bool