diff --git a/starboard/android/shared/jni_env_ext.cc b/starboard/android/shared/jni_env_ext.cc
index 9d6361d5d356..7ba6c687d660 100644
--- a/starboard/android/shared/jni_env_ext.cc
+++ b/starboard/android/shared/jni_env_ext.cc
@@ -30,8 +30,9 @@ jobject g_application_class_loader = NULL;
 jobject g_starboard_bridge = NULL;
 
 void Destroy(void* value) {
-  // OnThreadShutdown() must be called on each thread before it is destroyed.
-  SB_DCHECK(value == NULL);
+  if (value != NULL) {
+    starboard::android::shared::JniEnvExt::OnThreadShutdown();
+  }
 }
 
 }  // namespace