3 files changed, 4 insertions, 6 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 3d94828ec3..5e5425a697 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -893,7 +893,7 @@ Lyre prototype 1 */
 #endif
 
 /* Bootloaders don't need multivolume awareness */
-#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME)
+#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) && !(CONFIG_PLATFORM & PLATFORM_HOSTED)
 #undef HAVE_MULTIVOLUME
 #endif
 
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h
index 89a0f12b6a..0aeca695f0 100644
--- a/firmware/export/config/sim.h
+++ b/firmware/export/config/sim.h
@@ -25,11 +25,6 @@
 
 #undef AMS_OF_SIZE
 
-/* Simulator core requires hotswap */
-#ifndef HAVE_HOTSWAP
-#define HAVE_HOTSWAP
-#endif
-
 #undef HAVE_HOTSWAP_STORAGE_AS_MAIN
 #undef HAVE_STORAGE_FLUSH
 
diff --git a/firmware/export/mv.h b/firmware/export/mv.h
index 966ff9a032..1122c7b85f 100644
--- a/firmware/export/mv.h
+++ b/firmware/export/mv.h
@@ -120,6 +120,9 @@ bool volume_ismounted(IF_MV_NONVOID(int volume));
 #ifdef HAVE_HOTSWAP
 bool volume_removable(int volume);
 bool volume_present(int volume);
+#else
+#define volume_present(x) 1
+#define volueme_removeable(x) 0
 #endif /* HAVE_HOTSWAP */
 
 #ifdef HAVE_MULTIDRIVE