diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
index 5d9e5849af..8fbd03dd8c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
@@ -314,7 +314,7 @@ object StorageSyncHelper {
             SignalStore.notificationProfile.manuallyDisabledAt = System.currentTimeMillis()
           }
         }
-      } else {
+      } else if (update.new.proto.notificationProfileManualOverride!!.disabledAtTimestampMs != null) {
         SignalStore.notificationProfile.manuallyEnabledProfile = 0
         SignalStore.notificationProfile.manuallyEnabledUntil = 0
         SignalStore.notificationProfile.manuallyDisabledAt = update.new.proto.notificationProfileManualOverride!!.disabledAtTimestampMs!!