diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js
index 1b90abb..77a03ad 100644
--- a/packages/core/src/context/ContextSystem.js
+++ b/packages/core/src/context/ContextSystem.js
@@ -65,6 +65,8 @@
     contextChange(gl)
     {
         this.gl = gl;
+        this.renderer.gl = gl;
+        this.renderer.CONTEXT_UID = CONTEXT_UID++;
 
         // restore a context if it was previously lost
         if (gl.isContextLost() && gl.getExtension('WEBGL_lose_context'))

diff --git a/packages/core/src/context/ContextSystem.js b/packages/core/src/context/ContextSystem.js
index 1b90abb..77a03ad 100644
--- a/packages/core/src/context/ContextSystem.js
+++ b/packages/core/src/context/ContextSystem.js
@@ -65,6 +65,8 @@
     contextChange(gl)
     {
         this.gl = gl;
+        this.renderer.gl = gl;
+        this.renderer.CONTEXT_UID = CONTEXT_UID++;
 
         // restore a context if it was previously lost
         if (gl.isContextLost() && gl.getExtension('WEBGL_lose_context'))
diff --git a/packages/core/src/shader/ShaderSystem.js b/packages/core/src/shader/ShaderSystem.js
index d555d2f..f8324a4 100644
--- a/packages/core/src/shader/ShaderSystem.js
+++ b/packages/core/src/shader/ShaderSystem.js
@@ -64,6 +64,7 @@
     contextChange(gl)
     {
         this.gl = gl;
+        this.reset();
     }
 
     /**