diff --git a/app/src/main/java/com/sameerasw/essentials/services/InputEventListenerService.kt b/app/src/main/java/com/sameerasw/essentials/services/InputEventListenerService.kt
index 4a7788a03..02d6edd9d 100644
--- a/app/src/main/java/com/sameerasw/essentials/services/InputEventListenerService.kt
+++ b/app/src/main/java/com/sameerasw/essentials/services/InputEventListenerService.kt
@@ -168,9 +168,9 @@ class InputEventListenerService : Service() {
                                             android.media.AudioManager.ADJUST_RAISE
                                         else
                                             android.media.AudioManager.ADJUST_LOWER
-                                    am.adjustStreamVolume(
-                                        android.media.AudioManager.STREAM_MUSIC,
+                                    am.adjustSuggestedStreamVolume(
                                         direction,
+                                        android.media.AudioManager.USE_DEFAULT_STREAM_TYPE,
                                         android.media.AudioManager.FLAG_SHOW_UI
                                     )
                                 }
@@ -196,9 +196,9 @@ class InputEventListenerService : Service() {
                                         android.media.AudioManager.ADJUST_RAISE
                                     else
                                         android.media.AudioManager.ADJUST_LOWER
-                                am.adjustStreamVolume(
-                                    android.media.AudioManager.STREAM_MUSIC,
+                                am.adjustSuggestedStreamVolume(
                                     dirKey,
+                                    android.media.AudioManager.USE_DEFAULT_STREAM_TYPE,
                                     android.media.AudioManager.FLAG_SHOW_UI
                                 )
                             }
diff --git a/app/src/main/java/com/sameerasw/essentials/services/handlers/ButtonRemapHandler.kt b/app/src/main/java/com/sameerasw/essentials/services/handlers/ButtonRemapHandler.kt
index b483194b9..93cf2a3a2 100644
--- a/app/src/main/java/com/sameerasw/essentials/services/handlers/ButtonRemapHandler.kt
+++ b/app/src/main/java/com/sameerasw/essentials/services/handlers/ButtonRemapHandler.kt
@@ -150,9 +150,9 @@ class ButtonRemapHandler(
                 val am = service.getSystemService(Context.AUDIO_SERVICE) as AudioManager
                 val direction =
                     if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) AudioManager.ADJUST_RAISE else AudioManager.ADJUST_LOWER
-                am.adjustStreamVolume(
-                    AudioManager.STREAM_MUSIC,
+                am.adjustSuggestedStreamVolume(
                     direction,
+                    AudioManager.USE_DEFAULT_STREAM_TYPE,
                     AudioManager.FLAG_SHOW_UI
                 )
             }