diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 296cf5c47..a448ce174 100644
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -464,7 +464,8 @@
     - name: store existing rbd mirror peers in monitor config store
       when:
         - ceph_rbd_mirror_configure | default(True) | bool
-        - ceph_rbd_mirror_remote_user is undefined
+        - ceph_rbd_mirror_remote_user is defined
+        - ceph_rbd_mirror_remote_cluster is defined
       block:
         - name: import ceph-defaults
           import_role: