diff --git a/SDK/src/NDK/Entity.cpp b/SDK/src/NDK/Entity.cpp
index 815d0dc1b..a49a8f6aa 100644
--- a/SDK/src/NDK/Entity.cpp
+++ b/SDK/src/NDK/Entity.cpp
@@ -158,6 +158,9 @@ namespace Ndk
 
 		UnregisterAllHandles();
 
+		m_components.clear();
+		m_componentBits.Reset();
+
 		m_valid = false;
 	}