diff --git a/src/DebugUtils/EcsDebug.cs b/src/DebugUtils/EcsDebug.cs
index 884adc6..fc34c38 100644
--- a/src/DebugUtils/EcsDebug.cs
+++ b/src/DebugUtils/EcsDebug.cs
@@ -262,7 +262,7 @@ namespace DCFApixels.DragonECS
                     {
                         service.OnNewProfilerMark(record.Value, record.Key);
                     }
-                    oldService.OnDisableBaseService(service);
+                    oldService?.OnDisableBaseService(service);
                     service.OnEnableBaseService(oldService);
                     OnServiceChanged(service);
                 }