diff --git a/storage/fpost_sched.go b/storage/fpost_sched.go
index 9480dc3c2..9dc6992fa 100644
--- a/storage/fpost_sched.go
+++ b/storage/fpost_sched.go
@@ -102,10 +102,12 @@ func (s *fpostScheduler) update(ctx context.Context, new *types.TipSet) error {
 		return err
 	}
 
-	if newEPS != s.activeEPS {
-		s.abortActivePoSt()
+	if newEPS == s.activeEPS {
+		return nil
 	}
 
+	s.abortActivePoSt()
+
 	if newEPS != Inactive && start {
 		s.doPost(ctx, newEPS, new)
 	}
@@ -124,7 +126,7 @@ func (s *fpostScheduler) abortActivePoSt() {
 
 	log.Warnf("Aborting Fallback PoSt (EPS: %d)", s.activeEPS)
 
-	s.activeEPS = 0
+	s.activeEPS = Inactive
 	s.abort = nil
 }