diff --git a/app/modules/tenancy/templates/tenancy/merchant/team.html b/app/modules/tenancy/templates/tenancy/merchant/team.html
index 09ab0789..57245fec 100644
--- a/app/modules/tenancy/templates/tenancy/merchant/team.html
+++ b/app/modules/tenancy/templates/tenancy/merchant/team.html
@@ -270,7 +270,8 @@
 
 <!-- ==================== EDIT MODAL ==================== -->
 {% call modal('editModal', _('tenancy.team.edit_member'), 'showEditModal', size='md', show_footer=false) %}
-    <div x-show="selectedMember" class="space-y-4">
+    <template x-if="selectedMember">
+    <div class="space-y-4">
         <!-- Profile fields -->
         <div class="space-y-3">
             <h4 class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ _('tenancy.team.personal_info') }}</h4>
@@ -339,6 +340,7 @@
             </button>
         </div>
     </div>
+    </template>
 {% endcall %}
 
 <!-- ==================== REMOVE MODAL ==================== -->