diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
index fb7bbb84d8..b29f159a37 100644
--- a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
+++ b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
@@ -70,7 +70,15 @@ class StaticRequestHandler : public RequestHandler<ServerType> {
     , _path(path)
     , _cache_header(cache_header)
     {
-        _isFile = fs.exists(path);
+        if (fs.exists(path)) {
+            File file = fs.open(path, "r");
+            _isFile = file && file.isFile();
+            file.close();
+        }
+        else {
+            _isFile = false;
+        }
+        
         DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header);
         _baseUriLength = _uri.length();
     }
@@ -96,7 +104,7 @@ class StaticRequestHandler : public RequestHandler<ServerType> {
         if (!_isFile) {
             // Base URI doesn't point to a file.
             // If a directory is requested, look for index file.
-            if (requestUri.endsWith("/")) 
+            if (requestUri.endsWith("/"))
               requestUri += "index.htm";
 
             // Append whatever follows this URI in request to get the file path.