diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt
index cabf4c752d..fd7045af0b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt
@@ -12,7 +12,6 @@ import android.view.ViewGroup
 import androidx.annotation.RequiresApi
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.ViewModelProvider
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.databinding.PromptBatterySaverBottomSheetBinding
@@ -41,8 +40,6 @@ class PromptBatterySaverDialogFragment : FixedRoundedCornerBottomSheetDialogFrag
 
   private val binding by ViewBinderDelegate(PromptBatterySaverBottomSheetBinding::bind)
 
-  private lateinit var viewModel: PromptLogsViewModel
-
   private val disposables: LifecycleDisposable = LifecycleDisposable()
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -52,7 +49,6 @@ class PromptBatterySaverDialogFragment : FixedRoundedCornerBottomSheetDialogFrag
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     disposables.bindTo(viewLifecycleOwner)
 
-    viewModel = ViewModelProvider(this)[PromptLogsViewModel::class.java]
     binding.continueButton.setOnClickListener {
       PowerManagerCompat.requestIgnoreBatteryOptimizations(requireContext())
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt
index f0f855d2e4..970c34ad64 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt
@@ -16,6 +16,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject
 import org.thoughtcrime.securesms.crash.CrashConfig
 import org.thoughtcrime.securesms.database.LogDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.LocaleFeatureFlags
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration.Companion.days
 
@@ -48,7 +49,10 @@ class VitalsViewModel(private val context: Application) : AndroidViewModel(conte
     return Single.fromCallable {
       var state = State.NONE
       if (SlowNotificationHeuristics.isHavingDelayedNotifications()) {
-        if (SlowNotificationHeuristics.isPotentiallyCausedByBatteryOptimizations() && Build.VERSION.SDK_INT >= 23) {
+        if (LocaleFeatureFlags.isBatterySaverPromptEnabled() &&
+          SlowNotificationHeuristics.isPotentiallyCausedByBatteryOptimizations() &&
+          Build.VERSION.SDK_INT >= 23
+        ) {
           if (SlowNotificationHeuristics.shouldPromptBatterySaver()) {
             state = State.PROMPT_BATTERY_SAVER_DIALOG
           }