diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
index 2fefadc3..7c399d6c 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
@@ -380,6 +380,10 @@ class NavigationActivity : AppCompatActivity() {
 
     private fun exit() {
         Timber.d("User choose to exit the app")
+
+        // Broadcast that the service is being shutdown
+        RxBus.stopCommandPublisher.onNext(Unit)
+
         lifecycleSupport.onDestroy()
         finishAndRemoveTask()
     }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt
index e472637a..8d996f8c 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt
@@ -68,7 +68,6 @@ class RxBus {
             PublishSubject.create()
         val stopCommandObservable: Observable<Unit> =
             stopCommandPublisher.observeOn(mainThread())
-
     }
 
     data class StateWithTrack(