diff --git a/src/main/java/com/seibel/lod/proxy/GlProxy.java b/src/main/java/com/seibel/lod/proxy/GlProxy.java
index 71f928495..79b5d53d7 100644
--- a/src/main/java/com/seibel/lod/proxy/GlProxy.java
+++ b/src/main/java/com/seibel/lod/proxy/GlProxy.java
@@ -131,7 +131,13 @@ public class GlProxy
 			throw new IllegalStateException("Unable to change OpenGL contexts! tried to change to [" + newContext.toString() + "] from [" + currentContext.toString() + "] on thread: [" + Thread.currentThread().getName() + "] lod builder owner thread: " + (lodBuilderOwnerThread != null ? lodBuilderOwnerThread.getName() : "null"));
 		
 		if (newContext == GlProxyContext.LOD_BUILDER)
+		{
 			lodBuilderOwnerThread = Thread.currentThread();
+		}
+		else if (newContext == GlProxyContext.NONE && currentContext == GlProxyContext.LOD_BUILDER)
+		{
+			lodBuilderOwnerThread = null;
+		}
 		
 		GL.setCapabilities(newGlCapabilities);
 	}