diff --git a/server/consumer.go b/server/consumer.go
index 06ed0413..07473bcf 100644
--- a/server/consumer.go
+++ b/server/consumer.go
@@ -695,7 +695,9 @@ func (o *Consumer) readStoredState() error {
 
 	// Setup tracking timer if we have restored pending.
 	if len(o.pending) > 0 && o.ptmr == nil {
+		o.mu.Lock()
 		o.ptmr = time.AfterFunc(o.config.AckWait, o.checkPending)
+		o.mu.Unlock()
 	}
 	return err
 }
diff --git a/server/jetstream.go b/server/jetstream.go
index 533212b6..75736cd8 100644
--- a/server/jetstream.go
+++ b/server/jetstream.go
@@ -546,7 +546,6 @@ func (a *Account) EnableJetStream(limits *JetStreamAccountLimits) error {
 			if !cfg.Created.IsZero() {
 				obs.setCreated(cfg.Created)
 			}
-
 			if err := obs.readStoredState(); err != nil {
 				s.Warnf("    Error restoring Consumer state: %v", err)
 			}