diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp
index 30a32683b..fb8592404 100644
--- a/src/modules/graphics/opengl/Shader.cpp
+++ b/src/modules/graphics/opengl/Shader.cpp
@@ -429,6 +429,14 @@ void Shader::attach(bool temporary)
 
 void Shader::detach()
 {
+	if (defaultShader)
+	{
+		if (current != defaultShader)
+			defaultShader->attach();
+
+		return;
+	}
+
 	if (current != nullptr)
 		glUseProgram(0);