diff --git a/anki/deck.py b/anki/deck.py
index fb056318f..8a013f04b 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -3642,10 +3642,8 @@ update cards set type = type - 3 where type between 0 and 2 and priority = -3"""
         # - new delay1 handling
         if deck.delay0 == deck.delay1:
             deck.delay1 = 0
-        elif deck.delay1 >= 28800:
-            deck.delay1 = 1
         else:
-            deck.delay1 = 0
+            deck.delay1 = min(deck.delay1, 7)
         # unsuspend buried/rev early - can remove priorities in the future
         ids = deck.s.column0(
             "select id from cards where type > 2 or priority between -2 and -1")