diff --git a/architecture/src/main/java/org/mozilla/fenix/mvi/ActionBusFactory.kt b/architecture/src/main/java/org/mozilla/fenix/mvi/ActionBusFactory.kt
index ddd9cc06c..be13b7b7d 100644
--- a/architecture/src/main/java/org/mozilla/fenix/mvi/ActionBusFactory.kt
+++ b/architecture/src/main/java/org/mozilla/fenix/mvi/ActionBusFactory.kt
@@ -68,8 +68,8 @@ class ActionBusFactory private constructor(val owner: LifecycleOwner) {
 
     internal val observer = object : LifecycleObserver {
 
-        @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-        fun onStop() {
+        @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        fun onDestroy() {
             map.forEach { entry -> entry.value.onComplete() }
             buses.remove(owner)
         }
@@ -113,7 +113,7 @@ class ActionBusFactory private constructor(val owner: LifecycleOwner) {
     }
 
     /**
-     * getDestroyObservable observes to Lifecycle owner and fires during ON_STOP
+     * getDestroyObservable observes to Lifecycle owner and fires during ON_DESTROY
      */
     fun getDestroyObservable(): Observable<Unit> {
         return owner.createDestroyObservable()
@@ -149,7 +149,7 @@ inline fun LifecycleOwner?.createDestroyObservable(): Observable<Unit> {
             return@create
         }
         this.lifecycle.addObserver(object : LifecycleObserver {
-            @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
             fun emitDestroy() {
                 if (emitter.isDisposed) {
                     emitter.onNext(kotlin.Unit)