diff --git a/esp3d/configuration.h b/esp3d/configuration.h
index b4656fe9..de5ffe1f 100644
--- a/esp3d/configuration.h
+++ b/esp3d/configuration.h
@@ -157,7 +157,7 @@
 //FS_FLASH       mount Flash FS
 //FS_SD          mount SD FS
 //FS_USBDISK     mount USB disk FS
-//#define FTP_FEATURE  FS_ROOT
+#define FTP_FEATURE  FS_ROOT
 
 //DIRECT_PIN_FEATURE: allow to access pin using ESP201 command
 #define DIRECT_PIN_FEATURE
@@ -210,6 +210,13 @@
 //#define CAMERA_DEVICE_FLIP_HORIZONTALY//comment to disable
 #define CUSTOM_CAMERA_NAME "ESP32-CAM"
 
+////////////////////////////////////////////////
+//Warning until fix is found
+#if defined(CAMERA_DEVICE) && defined(FTP_FEATURE)
+#warning currently Camera and FTP server do not work together, disabling FTP SERVER
+#undef FTP_FEATURE
+#endif
+
 //Allow remote access by enabling cross origin access
 //check https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
 //this should be enabled only in specific cases
diff --git a/esp3d/src/core/espcmd/ESP420.cpp b/esp3d/src/core/espcmd/ESP420.cpp
index 86f176fc..53280dcc 100644
--- a/esp3d/src/core/espcmd/ESP420.cpp
+++ b/esp3d/src/core/espcmd/ESP420.cpp
@@ -150,6 +150,15 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type,
         output->print (": ");
     }
     output->print(ESP_FileSystem::formatBytes (ESP.getFreeHeap()).c_str());
+    
+    #ifdef ARDUINO_ARCH_ESP32
+#ifdef BOARD_HAS_PSRAM
+    output->print(" - PSRAM:");
+    output->print(ESP_FileSystem::formatBytes (ESP.getFreePsram()).c_str());
+
+#endif //BOARD_HAS_PSRAM
+#endif //ARDUINO_ARCH_ESP32
+    
     if (!plain) {
         output->print ("\"}");
     } else {