diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp
index d7da0061f..fe7b8c356 100755
--- a/desmume/src/OGLRender.cpp
+++ b/desmume/src/OGLRender.cpp
@@ -1956,8 +1956,15 @@ Render3DError OpenGLRenderer::ApplyRenderingSettings(const GFX3D_State &renderSt
 	
 	if (this->_selectedMultisampleSize != oldSelectedMultisampleSize)
 	{
+		if (!BEGINGL())
+		{
+			return OGLERROR_BEGINGL_FAILED;
+		}
+		
 		GLsizei sampleSize = this->GetLimitedMultisampleSize();
 		this->ResizeMultisampledFBOs(sampleSize);
+		
+		ENDGL();
 	}
 	
 	return Render3D::ApplyRenderingSettings(renderState);