diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
index 24495ef4..9ca89e58 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
@@ -982,6 +982,10 @@ void	plDXPipeline::IInitDeviceState()
 
 	fLights.Reset(this);
 
+	// Tell the light infos to unlink themselves
+	while (fActiveLights)
+		UnRegisterLight(fActiveLights);
+
 	return;
 }