diff --git a/Editor/src/Misc/GizmoDrawer.cpp b/Editor/src/Misc/GizmoDrawer.cpp
index df9ce0e7..9982986c 100644
--- a/Editor/src/Misc/GizmoDrawer.cpp
+++ b/Editor/src/Misc/GizmoDrawer.cpp
@@ -143,6 +143,11 @@ bool GizmoDrawer::IsEntityInSelection(Nuake::Entity entity)
 		return false;
 	}
 
+	if (!m_Editor->Selection.Entity.IsValid())
+	{
+		return false;
+	}
+
 	using namespace Nuake;
 	const Nuake::Entity selectedEntity = m_Editor->Selection.Entity;