diff --git a/firmware/SOURCES b/firmware/SOURCES
index 1bb48badea..206fff6677 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -496,6 +496,7 @@ target/arm/as3525/sd-as3525.c
 target/arm/as3525/scrollwheel-as3525.c
 #endif /* HAVE_SCROLLWHEEL */
 #else /* AS3535v2 */
+target/arm/as3525/tuner-as3525v2.c
 target/arm/as3525/sd-as3525v2.c
 #endif
 target/arm/as3525/power-as3525.c
@@ -1331,7 +1332,6 @@ target/arm/as3525/sansa-clipplus/backlight-clip.c
 target/arm/powermgmt-ascodec.c
 target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c
 target/arm/as3525/sansa-clipplus/lcd-as-clip-plus.S
-target/arm/as3525/tuner-as3525v2.c
 #endif /* !BOOTLOADER */
 #endif /* SANSA_CLIPPLUS */
 
@@ -1403,7 +1403,6 @@ target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S
 #endif /* SANSA_FUZE */
 
 #ifdef SANSA_FUZEV2
-target/arm/as3525/tuner-as3525v2.c
 target/arm/as3525/lcd-fuze.c
 target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
 target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
diff --git a/firmware/target/arm/as3525/tuner-as3525v2.c b/firmware/target/arm/as3525/tuner-as3525v2.c
index 0a478f65f4..cb2afe10d4 100644
--- a/firmware/target/arm/as3525/tuner-as3525v2.c
+++ b/firmware/target/arm/as3525/tuner-as3525v2.c
@@ -21,18 +21,21 @@
  *
  ****************************************************************************/
 #include "config.h"
-#include <stdint.h>
 #include "tuner.h"
 
-/* return the detected tuner type */
+#ifdef CONFIG_TUNER_MULTI
 int tuner_detect_type(void)
 {
+#if (CONFIG_TUNER & SI4700)
     if (si4700_detect()) {
         return SI4700;
     }
+#endif
+#if (CONFIG_TUNER & RDA5802)
     if (rda5802_detect()) {
         return RDA5802;
     }
-    return RDA5802;
+#endif
+    return RDA5082; /* returning 0 freezes the player : FS#11791 */
 }
-
+#endif