diff --git a/kotlin-audio/src/main/java/com/doublesymmetry/kotlinaudio/notification/NotificationManager.kt b/kotlin-audio/src/main/java/com/doublesymmetry/kotlinaudio/notification/NotificationManager.kt
index d8a83678..77dc34cf 100644
--- a/kotlin-audio/src/main/java/com/doublesymmetry/kotlinaudio/notification/NotificationManager.kt
+++ b/kotlin-audio/src/main/java/com/doublesymmetry/kotlinaudio/notification/NotificationManager.kt
@@ -714,17 +714,23 @@ class NotificationManager internal constructor(
                     }
 
                     is NotificationButton.STOP -> {
-                        showStopButton = true
+                        if (!needsCustomActionsToAddMissingButtons) {
+                            showStopButton = true
+                        }
                     }
 
                     is NotificationButton.FORWARD -> {
-                        showForwardButton = true
-                        showForwardButtonCompact = button.isCompact
+                        if (!needsCustomActionsToAddMissingButtons) {
+                            showForwardButton = true
+                            showForwardButtonCompact = button.isCompact
+                        }
                     }
 
                     is NotificationButton.BACKWARD -> {
-                        showRewindButton = true
-                        showRewindButtonCompact = button.isCompact
+                        if (!needsCustomActionsToAddMissingButtons) {
+                            showRewindButton = true
+                            showRewindButtonCompact = button.isCompact
+                        }
                     }
 
                     is NotificationButton.NEXT -> {