diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd810b2..60d63e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,15 +120,9 @@ target_link_arduino_libraries(${PROJECT_NAME}
         WiFi
         WiFiClientSecure
         Update
-#        WebServer
         DNSServer
         Preferences
-        SPIFFS
         SPI
-#        Ethernet
-#        esp32
-#        Wire
-#        FS
 )
 
 target_link_arduino_libraries(DNSServer PUBLIC WiFi)
diff --git a/lib/WebServer/src/WebServer.cpp b/lib/WebServer/src/WebServer.cpp
index f268a5c..a3c76b4 100644
--- a/lib/WebServer/src/WebServer.cpp
+++ b/lib/WebServer/src/WebServer.cpp
@@ -26,7 +26,9 @@
 #include <libb64/cencode.h>
 #include "WiFiClient.h"
 #include "WebServer.h"
-#include "FS.h"
+#ifdef WEBSERVER_ENABLE_STATIC_CONTENT
+  #include "FS.h"
+#endif
 #include "detail/RequestHandlersImpl.h"
 #include "mbedtls/md5.h"
 
@@ -258,9 +260,11 @@ void WebServer::_addRequestHandler(RequestHandler* handler) {
     }
 }
 
+#ifdef WEBSERVER_ENABLE_STATIC_CONTENT
 void WebServer::serveStatic(const char* uri, FS& fs, const char* path, const char* cache_header) {
     _addRequestHandler(new StaticRequestHandler(fs, path, uri, cache_header));
 }
+#endif
 
 void WebServer::handleClient() {
   if (_currentStatus == HC_NONE) {
diff --git a/lib/WebServer/src/WebServer.h b/lib/WebServer/src/WebServer.h
index 5ed6c90..fce4fed 100644
--- a/lib/WebServer/src/WebServer.h
+++ b/lib/WebServer/src/WebServer.h
@@ -90,7 +90,9 @@ public:
   void on(const Uri &uri, HTTPMethod method, THandlerFunction fn);
   void on(const Uri &uri, HTTPMethod method, THandlerFunction fn, THandlerFunction ufn);
   void addHandler(RequestHandler* handler);
+#ifdef WEBSERVER_ENABLE_STATIC_CONTENT
   void serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header = NULL );
+#endif
   void onNotFound(THandlerFunction fn);  //called when handler is not assigned
   void onFileUpload(THandlerFunction fn); //handle file uploads
 
diff --git a/lib/WebServer/src/detail/RequestHandlersImpl.h b/lib/WebServer/src/detail/RequestHandlersImpl.h
index 27a2a8d..6dd45d9 100644
--- a/lib/WebServer/src/detail/RequestHandlersImpl.h
+++ b/lib/WebServer/src/detail/RequestHandlersImpl.h
@@ -60,6 +60,7 @@ protected:
     HTTPMethod _method;
 };
 
+#ifdef WEBSERVER_ENABLE_STATIC_CONTENT
 class StaticRequestHandler : public RequestHandler {
 public:
     StaticRequestHandler(FS& fs, const char* path, const char* uri, const char* cache_header)
@@ -146,6 +147,6 @@ protected:
     bool _isFile;
     size_t _baseUriLength;
 };
-
+#endif
 
 #endif //REQUESTHANDLERSIMPL_H