diff --git a/app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt b/app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt
index 368bb4e91..8c0f43b59 100644
--- a/app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/base/BaseFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.CallSuper
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
@@ -39,7 +38,6 @@ abstract class BaseFragment<ViewModel : BaseViewModel, Binding : ViewDataBinding
         return binding.root
     }
 
-    @CallSuper
     override fun onEventDispatched(event: ViewEvent) {
         super.onEventDispatched(event)
         activity.onEventDispatched(event)
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
index e52f8d293..731029d6a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
@@ -43,8 +43,6 @@ abstract class CompatActivity<ViewModel : CompatViewModel, Binding : ViewDataBin
     }
 
     override fun onEventDispatched(event: ViewEvent) {
-        super.onEventDispatched(event)
-
         delegate.onEventExecute(event, this)
     }
 
@@ -54,7 +52,7 @@ abstract class CompatActivity<ViewModel : CompatViewModel, Binding : ViewDataBin
         }
     }
 
-    @Deprecated("The event is self handled.")
+    @Deprecated("The event is self handled.", level = DeprecationLevel.ERROR)
     override fun navigateTo(event: MagiskNavigationEvent) = Unit
 
     protected fun ViewEvent.dispatchOnSelf() = onEventDispatched(this)
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
index 886781f25..255933534 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
@@ -29,8 +29,6 @@ abstract class CompatFragment<ViewModel : CompatViewModel, Binding : ViewDataBin
     }
 
     override fun onEventDispatched(event: ViewEvent) {
-        super.onEventDispatched(event)
-
         delegate.onEventExecute(event, this)
     }