diff --git a/sources/Renderer/OpenGL/Command/GLCommand.h b/sources/Renderer/OpenGL/Command/GLCommand.h
index 2c6a26ea14..610597f741 100644
--- a/sources/Renderer/OpenGL/Command/GLCommand.h
+++ b/sources/Renderer/OpenGL/Command/GLCommand.h
@@ -179,6 +179,11 @@ struct GLCmdClearBuffers
 //  AttachmentClear attachments[numAttachments];
 };
 
+struct GLCmdResolveRenderTarget
+{
+    GLRenderTarget* renderTarget;
+};
+
 struct GLCmdBindVertexArray
 {
     GLSharedContextVertexArray* vertexArray;
diff --git a/sources/Renderer/OpenGL/Command/GLCommandAssembler.cpp b/sources/Renderer/OpenGL/Command/GLCommandAssembler.cpp
index 7a59ff56d8..3c669eed21 100644
--- a/sources/Renderer/OpenGL/Command/GLCommandAssembler.cpp
+++ b/sources/Renderer/OpenGL/Command/GLCommandAssembler.cpp
@@ -193,6 +193,12 @@ static std::size_t AssembleGLCommand(const GLOpcode opcode, const void* pc, JITC
             compiler.CallMember(&GLStateManager::ClearBuffers, g_stateMngrArg, cmd->numAttachments, (cmd + 1));
             return sizeof(*cmd);
         }
+        case GLOpcodeResolveRenderTarget:
+        {
+            auto cmd = reinterpret_cast<const GLCmdResolveRenderTarget*>(pc);
+            compiler.CallMember(&GLRenderTarget::ResolveMultisampled, pc->renderTarget, g_stateMngrArg);
+            return sizeof(*cmd);
+        }
         case GLOpcodeBindVertexArray:
         {
             auto cmd = reinterpret_cast<const GLCmdBindVertexArray*>(pc);
diff --git a/sources/Renderer/OpenGL/Command/GLCommandExecutor.cpp b/sources/Renderer/OpenGL/Command/GLCommandExecutor.cpp
index 7c9a0641aa..16532e34c0 100644
--- a/sources/Renderer/OpenGL/Command/GLCommandExecutor.cpp
+++ b/sources/Renderer/OpenGL/Command/GLCommandExecutor.cpp
@@ -192,6 +192,12 @@ static std::size_t ExecuteGLCommand(const GLOpcode opcode, const void* pc, GLSta
             stateMngr->ClearBuffers(cmd->numAttachments, reinterpret_cast<const AttachmentClear*>(cmd + 1));
             return (sizeof(*cmd) + sizeof(AttachmentClear)*cmd->numAttachments);
         }
+        case GLOpcodeResolveRenderTarget:
+        {
+            auto cmd = reinterpret_cast<const GLCmdResolveRenderTarget*>(pc);
+            cmd->renderTarget->ResolveMultisampled(*stateMngr);
+            return sizeof(*cmd);
+        }
         case GLOpcodeBindVertexArray:
         {
             auto cmd = reinterpret_cast<const GLCmdBindVertexArray*>(pc);
diff --git a/sources/Renderer/OpenGL/Command/GLCommandOpcode.h b/sources/Renderer/OpenGL/Command/GLCommandOpcode.h
index 65fde3e626..ffcff87bc6 100644
--- a/sources/Renderer/OpenGL/Command/GLCommandOpcode.h
+++ b/sources/Renderer/OpenGL/Command/GLCommandOpcode.h
@@ -39,6 +39,7 @@ enum GLOpcode : std::uint8_t
     GLOpcodeClear,
     GLOpcodeClearAttachmentsWithRenderPass,
     GLOpcodeClearBuffers,
+    GLOpcodeResolveRenderTarget,
     GLOpcodeBindVertexArray,
     GLOpcodeBindElementArrayBufferToVAO,
     GLOpcodeBindBufferBase,
diff --git a/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.cpp b/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.cpp
index 4dc2812d83..d25a3e5a7d 100644
--- a/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.cpp
+++ b/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.cpp
@@ -8,6 +8,7 @@
 #include "GLDeferredCommandBuffer.h"
 #include "GLCommand.h"
 #include <LLGL/Constants.h>
+#include <LLGL/TypeInfo.h>
 
 #include "../../TextureUtils.h"
 #include "../GLSwapChain.h"
@@ -502,11 +503,30 @@ void GLDeferredCommandBuffer::BeginRenderPass(
             ::memcpy(cmd + 1, clearValues, sizeof(ClearValue)*numClearValues);
         }
     }
+
+    /*
+    Cache render target if it needs to be resolved at the following EndRenderPass() call.
+    This is one of the few states the deferred GL command buffer caches
+    as it must be guaranteed that this render pass is followed by a call to EndRenderPass() operating on the same render-target.
+    */
+    if (!LLGL::IsInstanceOf<SwapChain>(renderTarget))
+    {
+        auto& renderTargetGL = LLGL_CAST(GLRenderTarget&, renderTarget);
+        if (renderTargetGL.CanResolveMultisampledFBO())
+            renderTargetToResolve_ = &renderTargetGL;
+    }
 }
 
 void GLDeferredCommandBuffer::EndRenderPass()
 {
-    // dummy
+    if (renderTargetToResolve_ != nullptr)
+    {
+        auto cmd = AllocCommand<GLCmdResolveRenderTarget>(GLOpcodeResolveRenderTarget);
+        {
+            cmd->renderTarget = renderTargetToResolve_;
+        }
+        renderTargetToResolve_ = nullptr;
+    }
 }
 
 void GLDeferredCommandBuffer::Clear(long flags, const ClearValue& clearValue)
diff --git a/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.h b/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.h
index 464503434d..a9ef02e300 100644
--- a/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.h
+++ b/sources/Renderer/OpenGL/Command/GLDeferredCommandBuffer.h
@@ -116,6 +116,7 @@ class GLDeferredCommandBuffer final : public GLCommandBuffer
 
         long                        flags_                  = 0;
         GLVirtualCommandBuffer      buffer_;
+        GLRenderTarget*             renderTargetToResolve_  = nullptr;
 
         #ifdef LLGL_ENABLE_JIT_COMPILER
         std::unique_ptr<JITProgram> executable_;
diff --git a/sources/Renderer/OpenGL/Command/GLImmediateCommandBuffer.cpp b/sources/Renderer/OpenGL/Command/GLImmediateCommandBuffer.cpp
index 07e849def8..b63115f3e8 100644
--- a/sources/Renderer/OpenGL/Command/GLImmediateCommandBuffer.cpp
+++ b/sources/Renderer/OpenGL/Command/GLImmediateCommandBuffer.cpp
@@ -431,7 +431,9 @@ void GLImmediateCommandBuffer::BeginRenderPass(
 
 void GLImmediateCommandBuffer::EndRenderPass()
 {
-    // dummy
+    /* Resolve previously bound render target */
+    if (GLRenderTarget* renderTarget = stateMngr_->GetBoundRenderTarget())
+        renderTarget->ResolveMultisampled(*stateMngr_);
 }
 
 void GLImmediateCommandBuffer::Clear(long flags, const ClearValue& clearValue)
diff --git a/sources/Renderer/OpenGL/GLStaticAssertions.cpp b/sources/Renderer/OpenGL/GLStaticAssertions.cpp
index aa988162f4..f0db96bda8 100644
--- a/sources/Renderer/OpenGL/GLStaticAssertions.cpp
+++ b/sources/Renderer/OpenGL/GLStaticAssertions.cpp
@@ -47,6 +47,7 @@ LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdClearStencil );
 LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdClear );
 LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdClearAttachmentsWithRenderPass );
 LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdClearBuffers );
+LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdResolveRenderTarget );
 LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdBindVertexArray );
 LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdBindElementArrayBufferToVAO );
 LLGL_ASSERT_STDLAYOUT_STRUCT( GLCmdBindBufferBase );
diff --git a/sources/Renderer/OpenGL/RenderState/GLStateManager.cpp b/sources/Renderer/OpenGL/RenderState/GLStateManager.cpp
index 23d24f9e5c..2e92b22ca3 100644
--- a/sources/Renderer/OpenGL/RenderState/GLStateManager.cpp
+++ b/sources/Renderer/OpenGL/RenderState/GLStateManager.cpp
@@ -1524,9 +1524,6 @@ GLuint GLStateManager::GetBoundProgramPipeline() const
 
 void GLStateManager::BindRenderTarget(RenderTarget& renderTarget, GLStateManager** nextStateManager)
 {
-    /* Resolve previously bound render target */
-    ResolveMultisampledRenderTarget();
-
     /* Bind render target/context */
     if (LLGL::IsInstanceOf<SwapChain>(renderTarget))
     {
@@ -1824,12 +1821,6 @@ void GLStateManager::RestoreWriteMasks(GLIntermediateBufferWriteMasks& intermedi
 
 /* ----- Render pass ----- */
 
-void GLStateManager::ResolveMultisampledRenderTarget()
-{
-    if (auto* renderTarget = GetBoundRenderTarget())
-        renderTarget->ResolveMultisampled(*this);
-}
-
 void GLStateManager::ClearAttachmentsWithRenderPass(
     const GLRenderPass& renderPassGL,
     std::uint32_t       numClearValues,
diff --git a/sources/Renderer/OpenGL/RenderState/GLStateManager.h b/sources/Renderer/OpenGL/RenderState/GLStateManager.h
index 5b29e0b187..ae4cc53e3d 100644
--- a/sources/Renderer/OpenGL/RenderState/GLStateManager.h
+++ b/sources/Renderer/OpenGL/RenderState/GLStateManager.h
@@ -344,9 +344,6 @@ class GLStateManager
 
         /* ----- Render pass ----- */
 
-        // Blits the currently bound render target
-        void ResolveMultisampledRenderTarget();
-
         std::uint32_t ClearColorBuffers(
             const std::uint8_t*             colorBuffers,
             std::uint32_t                   numClearValues,
diff --git a/sources/Renderer/OpenGL/Texture/GLRenderTarget.cpp b/sources/Renderer/OpenGL/Texture/GLRenderTarget.cpp
index f244af17c8..cf4ff1fedf 100644
--- a/sources/Renderer/OpenGL/Texture/GLRenderTarget.cpp
+++ b/sources/Renderer/OpenGL/Texture/GLRenderTarget.cpp
@@ -85,9 +85,14 @@ const RenderPass* GLRenderTarget::GetRenderPass() const
     return renderPass_;
 }
 
+bool GLRenderTarget::CanResolveMultisampledFBO() const
+{
+    return (framebufferResolve_.Valid() && !drawBuffersResolve_.empty());
+}
+
 void GLRenderTarget::ResolveMultisampled(GLStateManager& stateMngr)
 {
-    if (framebufferResolve_.Valid() && !drawBuffersResolve_.empty())
+    if (CanResolveMultisampledFBO())
     {
         stateMngr.BindFramebuffer(GLFramebufferTarget::DrawFramebuffer, framebufferResolve_.GetID());
         stateMngr.BindFramebuffer(GLFramebufferTarget::ReadFramebuffer, framebuffer_.GetID());
diff --git a/sources/Renderer/OpenGL/Texture/GLRenderTarget.h b/sources/Renderer/OpenGL/Texture/GLRenderTarget.h
index fea4cc9b48..64bd604e39 100644
--- a/sources/Renderer/OpenGL/Texture/GLRenderTarget.h
+++ b/sources/Renderer/OpenGL/Texture/GLRenderTarget.h
@@ -41,6 +41,9 @@ class GLRenderTarget final : public RenderTarget
         GLRenderTarget(const RenderingLimits& limits, const RenderTargetDescriptor& desc);
         ~GLRenderTarget();
 
+        // Returns true if this render-target can resolve its multi-sampled FBO into a single sampled FBO.
+        bool CanResolveMultisampledFBO() const;
+
         // Blits the multi-sample framebuffer onto the default framebuffer.
         void ResolveMultisampled(GLStateManager& stateMngr);