diff --git a/SDK/include/NDK/Systems/RenderSystem.hpp b/SDK/include/NDK/Systems/RenderSystem.hpp
index a35dc53ba..5cd046f55 100644
--- a/SDK/include/NDK/Systems/RenderSystem.hpp
+++ b/SDK/include/NDK/Systems/RenderSystem.hpp
@@ -27,6 +27,7 @@ namespace Ndk
 			static SystemIndex systemIndex;
 
 		private:
+			void OnEntityRemoved(Entity* entity) override;
 			void OnEntityValidation(Entity* entity, bool justAdded) override;
 
 			EntityList m_cameras;
diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NDK/Systems/RenderSystem.cpp
index 4c4f3a629..e114499e7 100644
--- a/SDK/src/NDK/Systems/RenderSystem.cpp
+++ b/SDK/src/NDK/Systems/RenderSystem.cpp
@@ -16,6 +16,12 @@ namespace Ndk
 	{
 	}
 
+	void RenderSystem::OnEntityRemoved(Entity* entity)
+	{
+		m_cameras.Remove(entity);
+		m_drawables.Remove(entity);
+	}
+
 	void RenderSystem::OnEntityValidation(Entity* entity, bool justAdded)
 	{
 		if (entity->HasComponent<CameraComponent>())