diff --git a/poi/src/main/java/org/apache/poi/util/TempFile.java b/poi/src/main/java/org/apache/poi/util/TempFile.java
index e3648a4f7c..2b668dc885 100644
--- a/poi/src/main/java/org/apache/poi/util/TempFile.java
+++ b/poi/src/main/java/org/apache/poi/util/TempFile.java
@@ -120,7 +120,12 @@ public final class TempFile {
     }
 
     private static TempFileCreationStrategy getStrategy() {
-        TempFileCreationStrategy s = threadLocalStrategy.get();
-        return s == null ? strategy : s;
+        final TempFileCreationStrategy s = threadLocalStrategy.get();
+        if (s == null) {
+            threadLocalStrategy.remove();
+            return strategy;
+        } else {
+            return s;
+        }
     }
 }