diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 3f0debb70..e51545f78 100644
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -462,7 +462,9 @@
   gather_facts: true
   tasks:
     - name: store existing rbd mirror peers in monitor config store
-      when: ceph_rbd_mirror_configure | default(False) | bool
+      when:
+        - ceph_rbd_mirror_configure | default(True) | bool
+        - ceph_rbd_mirror_remote_user is undefined
       block:
         - name: import ceph-defaults
           import_role: