diff --git a/Source/Engine/Physics/Colliders/CharacterController.cpp b/Source/Engine/Physics/Colliders/CharacterController.cpp
index e6bd8cd52..b12472555 100644
--- a/Source/Engine/Physics/Colliders/CharacterController.cpp
+++ b/Source/Engine/Physics/Colliders/CharacterController.cpp
@@ -272,6 +272,9 @@ RigidBody* CharacterController::GetAttachedRigidBody() const
 
 void CharacterController::OnActiveTransformChanged()
 {
+    if (!_shape)
+        return;
+
     // Change actor transform (but with locking)
     ASSERT(!_isUpdatingTransform);
     _isUpdatingTransform = true;