diff --git a/lib/framework/UploadFileService.cpp b/lib/framework/UploadFileService.cpp
index e2d07d83b..b876a195b 100644
--- a/lib/framework/UploadFileService.cpp
+++ b/lib/framework/UploadFileService.cpp
@@ -29,9 +29,12 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
         std::string extension = fname.substr(position + 1);
         size_t      fsize     = request->contentLength();
 
+#ifdef EMSESP_DEBUG
 #if defined(EMSESP_USE_SERIAL)
+        Serial.println();
         Serial.printf("Received filename: %s, len: %d, index: %d, ext: %s, fsize: %d", filename.c_str(), len, index, extension.c_str(), fsize);
         Serial.println();
+#endif
 #endif
 
         is_firmware = false;
diff --git a/src/command.cpp b/src/command.cpp
index 6c8936976..a8fea507a 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -52,8 +52,10 @@ uint8_t Command::process(const char * path, const bool is_admin, const JsonObjec
         }
     }
 
+#ifdef EMSESP_DEBUG
 #if defined(EMSESP_USE_SERIAL)
     // Serial.println(p.path().c_str()); // dump paths, for debugging
+#endif
 #endif
 
     // re-calculate new path