diff --git a/src/store/Namespace.ts b/src/store/Namespace.ts
index 7ac261847..e5ddefaa0 100644
--- a/src/store/Namespace.ts
+++ b/src/store/Namespace.ts
@@ -152,13 +152,8 @@ export default {
             return linkedAddress;
         },
 
-        SIGNER_CHANGED({ commit, rootGetters, getters }) {
-            const namespaces: NamespaceModel[] = getters['namespaces'];
-            const currentSignerAddress: Address = rootGetters['account/currentSignerAddress'];
-            if (!currentSignerAddress) {
-                return;
-            }
-            commit('namespaces', { namespaces, currentSignerAddress });
+        SIGNER_CHANGED({ dispatch }) {
+            dispatch('LOAD_NAMESPACES');
         },
 
         async RESOLVE_NAME({ commit, getters, rootGetters }, namespaceId: NamespaceId): Promise<string> {
diff --git a/src/views/forms/FormMetadataCreation/FormMetadataCreation.vue b/src/views/forms/FormMetadataCreation/FormMetadataCreation.vue
index cd1ea24db..c429547a9 100644
--- a/src/views/forms/FormMetadataCreation/FormMetadataCreation.vue
+++ b/src/views/forms/FormMetadataCreation/FormMetadataCreation.vue
@@ -8,7 +8,7 @@
                         v-model="formItems.signerAddress"
                         :signers="signers"
                         label="form_label_by_account"
-                        @input="onChangeSigner"
+                        @input="onMetadataSignerChanged"
                     />
                     <FormRow v-else>
                         <template v-slot:label> {{ $t('form_label_by_account') }}: </template>
diff --git a/src/views/forms/FormMetadataCreation/FormMetadataCreationTs.ts b/src/views/forms/FormMetadataCreation/FormMetadataCreationTs.ts
index 94b1b1421..68463b397 100644
--- a/src/views/forms/FormMetadataCreation/FormMetadataCreationTs.ts
+++ b/src/views/forms/FormMetadataCreation/FormMetadataCreationTs.ts
@@ -387,4 +387,9 @@ export class FormMetadataCreationTs extends FormTransactionBase {
             this.updateFormItems(this.value);
         }
     }
+
+    public async onMetadataSignerChanged(address: string) {
+        this.onChangeSigner(address);
+        this.formItems.targetId = '';
+    }
 }