diff --git a/packages/dev/core/src/Meshes/geometry.ts b/packages/dev/core/src/Meshes/geometry.ts
index 8f67dca067d..dc30627a8ba 100644
--- a/packages/dev/core/src/Meshes/geometry.ts
+++ b/packages/dev/core/src/Meshes/geometry.ts
@@ -308,7 +308,7 @@ export class Geometry implements IGetSetVerticesData {
             for (let index = 0; index < numOfMeshes; index++) {
                 const mesh = meshes[index];
                 mesh.buildBoundingInfo(this._extend.minimum, this._extend.maximum);
-                mesh._createGlobalSubMesh(false);
+                mesh._createGlobalSubMesh(mesh.isUnIndexed);
                 mesh.computeWorldMatrix(true);
                 mesh.synchronizeInstances();
             }
@@ -732,7 +732,7 @@ export class Geometry implements IGetSetVerticesData {
                 }
                 mesh.buildBoundingInfo(this._extend.minimum, this._extend.maximum);
 
-                mesh._createGlobalSubMesh(false);
+                mesh._createGlobalSubMesh(mesh.isUnIndexed);
 
                 //bounding info was just created again, world matrix should be applied again.
                 mesh._updateBoundingInfo();