diff --git a/src/viewer/metadata/MetaModel.js b/src/viewer/metadata/MetaModel.js
index f86ce6ab8..29a629dfc 100644
--- a/src/viewer/metadata/MetaModel.js
+++ b/src/viewer/metadata/MetaModel.js
@@ -227,7 +227,7 @@ class MetaModel {
                     this.metaScene.metaObjects[id] = metaObject;
                     metaObject.metaModels = [];
                 }
-                this.metaObjects[id] =metaObject;
+                this.metaObjects[id] = metaObject;
                 if (!metaObjectData.parent) {
                     this.rootMetaObjects.push(metaObject);
                     metaScene.rootMetaObjects[id] = metaObject;
diff --git a/src/viewer/metadata/MetaScene.js b/src/viewer/metadata/MetaScene.js
index 4d7911000..b0276d18b 100644
--- a/src/viewer/metadata/MetaScene.js
+++ b/src/viewer/metadata/MetaScene.js
@@ -185,13 +185,12 @@ class MetaScene {
         // Remove MetaObjects
 
         if (metaModel.metaObjects) {
-            for (let i = 0, len = metaModel.metaObjects.length; i < len; i++) {
-                const metaObject = metaModel.metaObjects[i];
-                const id = metaObject.id;
+            for (let objectId in metaModel.metaObjects) {
+                const metaObject = metaModel.metaObjects[objectId];
                 if (metaObject.metaModels.length === 1 && metaObject.metaModels[0].id === metaModelId) { // MetaObject owned only by this model, delete
-                    delete this.metaObjects[id];
+                    delete this.metaObjects[objectId];
                     if (!metaObject.parent) {
-                        delete this.rootMetaObjects[id];
+                        delete this.rootMetaObjects[objectId];
                     }
                 } else {
                     metaObject.metaModels = metaObject.metaModels.filter(metaModel => metaModel.id !== metaModelId);