diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
index bb72dc3e92..81944216bc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
@@ -198,6 +198,6 @@ public class UiHintValues extends SignalStoreValues {
    * Sets the version number of the support article that users see if they have device-specific notifications issues
    */
   public void setLastSupportVersionSeen(int version) {
-    putLong(LAST_SUPPORT_VERSION_SEEN, version);
+    putInteger(LAST_SUPPORT_VERSION_SEEN, version);
   }
 }
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 1128361bc7..c0b0915469 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt
@@ -53,7 +53,7 @@ class VitalsViewModel(private val context: Application) : AndroidViewModel(conte
           }
         }
         DeviceSpecificNotificationConfig.ShowCondition.HAS_BATTERY_OPTIMIZATION_ON -> {
-          if (SlowNotificationHeuristics.isBatteryOptimizationsOn()) {
+          if (SlowNotificationHeuristics.shouldShowDialog() && SlowNotificationHeuristics.isBatteryOptimizationsOn()) {
             state = State.PROMPT_SPECIFIC_BATTERY_SAVER_DIALOG
           }
         }