diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
index e19639317..9388d4ac4 100644
--- a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
+++ b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
@@ -80,7 +80,7 @@ public:
         else {
             _isFile = false;
         }
-        
+
         DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header);
         _baseUriLength = _uri.length();
     }
@@ -134,6 +134,11 @@ public:
         if (!f)
             return false;
 
+        if (!f.isFile()) {
+            f.close();
+            return false;
+        }
+
         if (_cache_header.length() != 0)
             server.sendHeader("Cache-Control", _cache_header);