diff --git a/thermion_dart/native/include/scene/GeometrySceneAsset.hpp b/thermion_dart/native/include/scene/GeometrySceneAsset.hpp
index 98598fc6..1cd85181 100644
--- a/thermion_dart/native/include/scene/GeometrySceneAsset.hpp
+++ b/thermion_dart/native/include/scene/GeometrySceneAsset.hpp
@@ -51,12 +51,12 @@ namespace thermion
 
         MaterialInstance **getMaterialInstances() override
         {
-            return _materialInstances;
+            return _materialInstances.data();
         }
 
         size_t getMaterialInstanceCount() override
         {
-            return _materialInstanceCount;
+            return _materialInstances.size();
         }
 
         VertexBuffer *getVertexBuffer() const { return _vertexBuffer; }
@@ -135,8 +135,7 @@ namespace thermion
         Engine *_engine = nullptr;
         VertexBuffer *_vertexBuffer = nullptr;
         IndexBuffer *_indexBuffer = nullptr;
-        MaterialInstance **_materialInstances = nullptr;
-        size_t _materialInstanceCount = 0;
+        std::vector<MaterialInstance*> _materialInstances;
         Box _boundingBox;
         GeometrySceneAsset *_instanceOwner = std::nullptr_t();
         utils::Entity _entity;
diff --git a/thermion_dart/native/src/scene/GeometrySceneAsset.cpp b/thermion_dart/native/src/scene/GeometrySceneAsset.cpp
index b60872ec..d8a75d06 100644
--- a/thermion_dart/native/src/scene/GeometrySceneAsset.cpp
+++ b/thermion_dart/native/src/scene/GeometrySceneAsset.cpp
@@ -27,8 +27,15 @@ namespace thermion
         RenderableManager::PrimitiveType primitiveType,
         Box boundingBox,
         GeometrySceneAsset *instanceOwner)
-        : _engine(engine), _vertexBuffer(vertexBuffer), _indexBuffer(indexBuffer), _materialInstances(materialInstances), _materialInstanceCount(materialInstanceCount), _primitiveType(primitiveType), _boundingBox(boundingBox), _instanceOwner(instanceOwner)
+        : _engine(engine), 
+        _vertexBuffer(vertexBuffer),
+        _indexBuffer(indexBuffer),
+        _primitiveType(primitiveType),
+        _boundingBox(boundingBox),
+        _instanceOwner(instanceOwner)
     {
+        _materialInstances.insert(_materialInstances.begin(), materialInstances, materialInstances + materialInstanceCount);
+
         _entity = utils::EntityManager::get().create();
 
         RenderableManager::Builder builder(1);
@@ -63,9 +70,10 @@ namespace thermion
             return nullptr;
         }
 
-        if(materialInstanceCount == 0) {
-            materialInstanceCount = _materialInstanceCount;
-            materialInstances = _materialInstances;
+        if(materialInstanceCount == 0 && _materialInstances.size() > 0) {
+            materialInstanceCount = _materialInstances.size();
+            materialInstances = _materialInstances.data();
+            TRACE("No material instances provided, re-using %d existing material instances", materialInstanceCount);
         }
 
         std::unique_ptr<GeometrySceneAsset> instance = std::make_unique<GeometrySceneAsset>(