diff --git a/src/api/Metadata.js b/src/api/Metadata.js
index 307e13c4a0..aae2a68e9d 100644
--- a/src/api/Metadata.js
+++ b/src/api/Metadata.js
@@ -400,7 +400,6 @@ class Metadata extends File {
             id: instance.$id,
             fields,
             scope: template.scope,
-            templateId: template.id,
             templateKey: template.templateKey,
             type: instance.$type,
         };
@@ -830,7 +829,9 @@ class Metadata extends File {
                 const metadata = cache.get(key);
                 if (isMetadataRedesign) {
                     metadata.templateInstances.splice(
-                        metadata.templateInstances.findIndex(instance => instance.templateId === template.id),
+                        metadata.templateInstances.findIndex(
+                            instance => instance.scope === scope && instance.templateKey === templateKey,
+                        ),
                         1,
                     );
                 } else {
diff --git a/src/api/__tests__/Metadata.test.js b/src/api/__tests__/Metadata.test.js
index b7fe9844e1..08e9808b1f 100644
--- a/src/api/__tests__/Metadata.test.js
+++ b/src/api/__tests__/Metadata.test.js
@@ -193,6 +193,7 @@ describe('api/Metadata', () => {
                         ],
                         id: '123456',
                         templateKey: 'instance_from_template',
+                        scope: 'enterprise',
                     },
                     true,
                 ),
@@ -219,8 +220,7 @@ describe('api/Metadata', () => {
                         value: '2.1',
                     },
                 ],
-                scope: undefined,
-                templateId: '123456',
+                scope: 'enterprise',
                 templateKey: 'instance_from_template',
             });
         });
@@ -254,7 +254,6 @@ describe('api/Metadata', () => {
                         value: 'This is string',
                     },
                 ],
-                templateId: '123456',
                 templateKey: 'properties',
             });
         });
diff --git a/src/common/types/metadata.js b/src/common/types/metadata.js
index f73bd1e7f4..04eebdc590 100644
--- a/src/common/types/metadata.js
+++ b/src/common/types/metadata.js
@@ -132,7 +132,6 @@ type MetadataTemplateInstance = {
     id: string,
     fields: MetadataTemplateInstanceField[],
     scope: string,
-    templateId?: string,
     templateKey: string,
     type: string,
 };