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 0e655d43a9..e8417279b0 100644
--- a/poi/src/main/java/org/apache/poi/util/TempFile.java
+++ b/poi/src/main/java/org/apache/poi/util/TempFile.java
@@ -63,7 +63,11 @@ public final class TempFile {
      * @since POI 5.4.2
      */
     public static void setThreadLocalTempFileCreationStrategy(TempFileCreationStrategy strategy) {
-        threadLocalStrategy.set(strategy);
+        if (strategy == null) {
+            threadLocalStrategy.remove();
+        } else {
+            threadLocalStrategy.set(strategy);
+        }
     }
     
     /**