diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index 5279cafe1b..2720424c57 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -2484,7 +2484,7 @@ static void cliFlashInfo(const char *cmdName, char *cmdline)
 #endif
 }
 
-
+#ifdef USE_FLASH_TOOLS
 static void cliFlashErase(const char *cmdName, char *cmdline)
 {
     UNUSED(cmdName);
@@ -2521,8 +2521,6 @@ static void cliFlashErase(const char *cmdName, char *cmdline)
     cliPrintLine("Done.");
 }
 
-#ifdef USE_FLASH_TOOLS
-
 static void cliFlashVerify(const char *cmdName, char *cmdline)
 {
     UNUSED(cmdline);
@@ -2583,7 +2581,6 @@ static void cliFlashRead(const char *cmdName, char *cmdline)
         cliPrintLinefeed();
     }
 }
-
 #endif
 #endif
 
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index bce394873d..8d7a6a871c 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -195,6 +195,11 @@
 #undef USE_ADC_INTERNAL
 #endif
 
+#ifdef USE_FLASH
+#define USE_FLASHFS
+#define USE_FLASH_TOOLS
+#endif
+
 #if defined(USE_FLASH_W25M512)
 #define USE_FLASH_W25M
 #define USE_FLASH_M25P16