diff --git a/src/EGL/libeglcurrent.c b/src/EGL/libeglcurrent.c
index b40cabe..a09b96d 100644
--- a/src/EGL/libeglcurrent.c
+++ b/src/EGL/libeglcurrent.c
@@ -91,6 +91,7 @@ void __eglCurrentTeardown(EGLBoolean doReset)
         __eglDestroyAPIState(apiState);
     }
 
+    __glvndPthreadFuncs.setspecific(threadStateKey, NULL);
     while (!glvnd_list_is_empty(&currentThreadStateList)) {
         __EGLThreadAPIState *threadState = glvnd_list_first_entry(
                 &currentThreadStateList, __EGLThreadAPIState, entry);