diff --git a/storage/wdpost_run.go b/storage/wdpost_run.go
index 8cd9fdc5f..3a55356ba 100644
--- a/storage/wdpost_run.go
+++ b/storage/wdpost_run.go
@@ -111,7 +111,7 @@ func (s *WindowPoStScheduler) checkSectors(ctx context.Context, check *abi.BitFi
 	return &sbf, nil
 }
 
-func (s *WindowPoStScheduler) checkNextRecoveries(ctx context.Context, deadline uint64, ts *types.TipSet) error {
+func (s *WindowPoStScheduler) checkNextRecoveries(ctx context.Context, deadline uint64, deadlineSectors *abi.BitField, ts *types.TipSet) error {
 	faults, err := s.api.StateMinerFaults(ctx, s.actor, ts.Key())
 	if err != nil {
 		return xerrors.Errorf("getting on-chain faults: %w", err)
@@ -136,6 +136,11 @@ func (s *WindowPoStScheduler) checkNextRecoveries(ctx context.Context, deadline
 		return xerrors.Errorf("subtracting recovered set from fault set: %w", err)
 	}
 
+	unrecovered, err = bitfield.IntersectBitField(unrecovered, deadlineSectors)
+	if err != nil {
+		return xerrors.Errorf("intersect unrecovered set with deadlineSectors: %w", err)
+	}
+
 	uc, err := unrecovered.Count()
 	if err != nil {
 		return xerrors.Errorf("counting unrecovered sectors: %w", err)
@@ -326,7 +331,7 @@ func (s *WindowPoStScheduler) runPost(ctx context.Context, di miner.DeadlineInfo
 		// late to declare them for this deadline
 		declDeadline := (di.Index + 1) % miner.WPoStPeriodDeadlines
 
-		if err := s.checkNextRecoveries(ctx, declDeadline, ts); err != nil {
+		if err := s.checkNextRecoveries(ctx, declDeadline, deadlines.Due[declDeadline], ts); err != nil {
 			// TODO: This is potentially quite bad, but not even trying to post when this fails is objectively worse
 			log.Errorf("checking sector recoveries: %v", err)
 		}