diff --git a/src/Nazara/Renderer/RenderTexture.cpp b/src/Nazara/Renderer/RenderTexture.cpp
index 3a8b7ac6e..439d7b8b3 100644
--- a/src/Nazara/Renderer/RenderTexture.cpp
+++ b/src/Nazara/Renderer/RenderTexture.cpp
@@ -358,6 +358,9 @@ void NzRenderTexture::Destroy()
 {
 	if (m_impl)
 	{
+		if (IsActive())
+			NzRenderer::SetTarget(nullptr);
+
 		bool canFreeFBO = true;
 		#if NAZARA_RENDERER_SAFE
 		if (NzContext::GetCurrent() != m_impl->context)
diff --git a/src/Nazara/Renderer/RenderWindow.cpp b/src/Nazara/Renderer/RenderWindow.cpp
index 00b7617b1..c76c356ac 100644
--- a/src/Nazara/Renderer/RenderWindow.cpp
+++ b/src/Nazara/Renderer/RenderWindow.cpp
@@ -7,6 +7,7 @@
 #include <Nazara/Core/Thread.hpp>
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
+#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
@@ -318,6 +319,9 @@ void NzRenderWindow::OnWindowDestroy()
 {
 	if (m_context)
 	{
+		if (IsActive())
+			NzRenderer::SetTarget(nullptr);
+
 		delete m_context;
 		m_context = nullptr;
 	}