diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index 33560c6..8c3cae6 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -696,18 +696,24 @@
 
 void Renderer11::applyShaders(gl::ProgramBinary *programBinary)
 {
-    ShaderExecutable *vertexExe = programBinary->getVertexExecutable();
-    ShaderExecutable *pixelExe = programBinary->getPixelExecutable();
+    unsigned int programBinarySerial = programBinary->getSerial();
+    if (programBinarySerial != mAppliedProgramBinarySerial)
+    {
+        ShaderExecutable *vertexExe = programBinary->getVertexExecutable();
+        ShaderExecutable *pixelExe = programBinary->getPixelExecutable();
 
-    ID3D11VertexShader *vertexShader = NULL;
-    if (vertexExe) vertexShader = ShaderExecutable11::makeShaderExecutable11(vertexExe)->getVertexShader();
+        ID3D11VertexShader *vertexShader = NULL;
+        if (vertexExe) vertexShader = ShaderExecutable11::makeShaderExecutable11(vertexExe)->getVertexShader();
 
-    ID3D11PixelShader *pixelShader = NULL;
-    if (pixelExe) pixelShader = ShaderExecutable11::makeShaderExecutable11(pixelExe)->getPixelShader();
+        ID3D11PixelShader *pixelShader = NULL;
+        if (pixelExe) pixelShader = ShaderExecutable11::makeShaderExecutable11(pixelExe)->getPixelShader();
 
-    mDeviceContext->PSSetShader(pixelShader, NULL, 0);
-    mDeviceContext->VSSetShader(vertexShader, NULL, 0);
-    programBinary->dirtyAllUniforms();
+        mDeviceContext->PSSetShader(pixelShader, NULL, 0);
+        mDeviceContext->VSSetShader(vertexShader, NULL, 0);
+        programBinary->dirtyAllUniforms();
+
+        mAppliedProgramBinarySerial = programBinarySerial;
+    }
 }
 
 void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
@@ -839,6 +845,8 @@
     mForceSetDepthStencilState = true;
     mForceSetScissor = true;
     mForceSetViewport = true;
+
+    mAppliedProgramBinarySerial = 0;
 }
 
 void Renderer11::releaseDeviceResources()
