diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 47e64cca01..4ab2ef3b50 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -123,7 +123,6 @@ import org.session.libsession.utilities.StringSubstitutionConstants.GROUP_NAME_K
 import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
 import org.session.libsession.utilities.Stub
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.TextSecurePreferences.Companion.CALL_NOTIFICATIONS_ENABLED
 import org.thoughtcrime.securesms.preferences.MessagingPreferences
 import org.thoughtcrime.securesms.preferences.NotificationPreferences
 import org.thoughtcrime.securesms.preferences.PreferenceStorage
@@ -1730,7 +1729,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                 button(R.string.sessionSettings, R.string.AccessibilityId_sessionSettings) {
                     val intent = Intent(context, PrivacySettingsActivity::class.java)
                     // allow the screen to auto scroll to the appropriate toggle
-                    intent.putExtra(PrivacySettingsActivity.SCROLL_AND_TOGGLE_KEY, CALL_NOTIFICATIONS_ENABLED)
+                    intent.putExtra(PrivacySettingsActivity.SCROLL_AND_TOGGLE_KEY, NotificationPreferences.CALL_NOTIFICATIONS_ENABLED.name)
                     context.startActivity(intent)
                 }
                 cancelButton()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt
index 1db5d129fd..fc94d35bfd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt
@@ -189,7 +189,7 @@ class HomeViewModel @Inject constructor(
     init {
         // check for white list status in case of slow mode
         if(!prefStorage[SystemPreferences.HAS_CHECKED_DOZE_WHITELIST] // the user has not yet seen the dialog
-            && !prefStorage[PushPreferences.isPushEnabled(TextSecurePreferences.pushSuffix)] // the user is in slow mode
+            && !prefStorage[PushPreferences.IS_PUSH_ENABLED] // the user is in slow mode
             && !context.isWhitelistedFromDoze() // the user isn't yet whitelisted
         ){
             prefStorage[SystemPreferences.HAS_CHECKED_DOZE_WHITELIST] = true