diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index 2720424c57..34d65cd21d 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -2451,8 +2451,7 @@ static void cliSdInfo(const char *cmdName, char *cmdline)
 
 #endif
 
-#ifdef USE_FLASH_CHIP
-
+#ifdef USE_FLASHFS
 static void cliFlashInfo(const char *cmdName, char *cmdline)
 {
     UNUSED(cmdName);
@@ -2474,17 +2473,15 @@ static void cliFlashInfo(const char *cmdName, char *cmdline)
         }
         cliPrintLinef("  %d: %s %u %u", index, flashPartitionGetTypeName(partition->type), partition->startSector, partition->endSector);
     }
-#ifdef USE_FLASHFS
+
     const flashPartition_t *flashPartition = flashPartitionFindByType(FLASH_PARTITION_TYPE_FLASHFS);
 
     cliPrintLinef("FlashFS size=%u, usedSize=%u",
             FLASH_PARTITION_SECTOR_COUNT(flashPartition) * layout->sectorSize,
             flashfsGetOffset()
     );
-#endif
 }
 
-#ifdef USE_FLASH_TOOLS
 static void cliFlashErase(const char *cmdName, char *cmdline)
 {
     UNUSED(cmdName);
@@ -2521,6 +2518,7 @@ static void cliFlashErase(const char *cmdName, char *cmdline)
     cliPrintLine("Done.");
 }
 
+#ifdef USE_FLASH_TOOLS
 static void cliFlashVerify(const char *cmdName, char *cmdline)
 {
     UNUSED(cmdline);
diff --git a/src/main/drivers/flash.c b/src/main/drivers/flash.c
index 191af158ab..aac8118248 100644
--- a/src/main/drivers/flash.c
+++ b/src/main/drivers/flash.c
@@ -332,7 +332,7 @@ const flashGeometry_t *flashGetGeometry(void)
 
 static void flashConfigurePartitions(void)
 {
-
+#if defined(FIRMWARE_SIZE) || defined(CONFIG_IN_EXTERNAL_FLASH) || defined(USE_FLASHFS)
     const flashGeometry_t *flashGeometry = flashGetGeometry();
     if (flashGeometry->totalSize == 0) {
         return;
@@ -345,6 +345,7 @@ static void flashConfigurePartitions(void)
     if (badBlockPartition) {
         endSector = badBlockPartition->startSector - 1;
     }
+#endif
 
 #if defined(FIRMWARE_SIZE)
     const uint32_t firmwareSize = (FIRMWARE_SIZE * 1024);