diff --git a/src/modules/metadata/services/MetadataMigrations.ts b/src/modules/metadata/services/MetadataMigrations.ts
index 91124b39..3b1b079b 100644
--- a/src/modules/metadata/services/MetadataMigrations.ts
+++ b/src/modules/metadata/services/MetadataMigrations.ts
@@ -95,18 +95,11 @@ const applyMetadataValueMigration = (meta: Metadata, migration: IMetadataMigrati
         };
 
         const migrateValueOfAllAppKeys = key === undefined;
-        if (migrateValueOfAllAppKeys) {
-            Object.keys(appMetadata).forEach((metaKey) => {
+        Object.keys(appMetadata).forEach((metaKey) => {
+            if (migrateValueOfAllAppKeys || metaKey.endsWith(key)) {
                 migrateValue(metaKey);
-            });
-            return;
-        }
-
-        if (!doesMetadataKeyExistIn(meta, key, undefined, appKeyPrefix)) {
-            return;
-        }
-
-        migrateValue(getMetadataKey(key, undefined, appKeyPrefix));
+            }
+        });
     });
 
     return migratedMetadata;