Index: source/simulation2/components/CCmpRangeManager.cpp
===================================================================
--- source/simulation2/components/CCmpRangeManager.cpp
+++ source/simulation2/components/CCmpRangeManager.cpp
@@ -343,7 +343,6 @@
 
 		componentManager.SubscribeToMessageType(MT_Deserialized);
 		componentManager.SubscribeToMessageType(MT_Update);
-		componentManager.SubscribeToMessageType(MT_RenderSubmit); // for debug overlays
 	}
 
 	DEFAULT_COMPONENT_ALLOCATOR(RangeManager)
@@ -1069,6 +1068,9 @@
 
 	virtual void SetDebugOverlay(bool enabled)
 	{
+		if (m_DebugOverlayEnabled != enabled)
+			GetSimContext().GetComponentManager().DynamicSubscriptionNonsync(MT_RenderSubmit, this, enabled);
+
 		m_DebugOverlayEnabled = enabled;
 		m_DebugOverlayDirty = true;
 		if (!enabled)
@@ -1398,8 +1400,6 @@
 
 	void RenderSubmit(SceneCollector& collector)
 	{
-		if (!m_DebugOverlayEnabled)
-			return;
 		static CColor disabledRingColor(1, 0, 0, 1);	// red
 		static CColor enabledRingColor(0, 1, 0, 1);	// green
 		static CColor subdivColor(0, 0, 1, 1);			// blue