diff --git a/firmware/drivers/audio/rocker_codec.c b/firmware/drivers/audio/rocker_codec.c
index abe13be285..4beda4b572 100644
--- a/firmware/drivers/audio/rocker_codec.c
+++ b/firmware/drivers/audio/rocker_codec.c
@@ -71,7 +71,11 @@ void audiohw_preinit(void)
 {
     alsa_controls_init();
     hw_open();
+#if defined(AUDIOHW_MUTE_ON_PAUSE) || defined (AUDIOHW_NEEDS_INITIAL_UNMUTE)
     audiohw_mute(true);  /* Start muted to avoid the POP */
+#else
+    audiohw_mute(false);
+#endif
 }
 
 void audiohw_postinit(void)
diff --git a/firmware/export/rocker_codec.h b/firmware/export/rocker_codec.h
index 48e280a4e4..c1ee7b87bc 100644
--- a/firmware/export/rocker_codec.h
+++ b/firmware/export/rocker_codec.h
@@ -2,9 +2,12 @@
 #define __ROCKER_CODEC__
 
 #define AUDIOHW_CAPS 0
-AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -102*10,  0, -30*10)
+AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -115*10,  0, -30*10)
 #endif
 
-#define AUDIOHW_MUTE_ON_PAUSE
+//#define AUDIOHW_MUTE_ON_PAUSE
+//#define AUDIOHW_NEEDS_INITIAL_UNMUTE
+
+/* Note:  Due to Kernel bug, we can't use MUTE_ON_PAUSE with backlight fading */
 
 void audiohw_mute(int mute);