diff --git a/src/g_shared/a_dynlight.cpp b/src/g_shared/a_dynlight.cpp
index 09b1a233d..a4808d4ea 100644
--- a/src/g_shared/a_dynlight.cpp
+++ b/src/g_shared/a_dynlight.cpp
@@ -265,7 +265,8 @@ void FDynamicLight::Tick()
 {
 	if (!target)
 	{
-		delete this;
+		// How did we get here? :?
+		ReleaseLight();
 		return;
 	}
 
@@ -273,7 +274,7 @@ void FDynamicLight::Tick()
 	{
 		if (!target->state)
 		{
-			delete this;
+			Deactivate();
 			return;
 		}
 		if (target->flags & MF_UNMORPHED)