diff --git a/server/consumer.go b/server/consumer.go
index 91866d5135b..b3b99eb092f 100644
--- a/server/consumer.go
+++ b/server/consumer.go
@@ -752,11 +752,11 @@ func (o *consumer) checkQueueInterest() {
 // clears our node if we have one. When we scale down to 1.
 func (o *consumer) clearNode() {
 	o.mu.Lock()
+	defer o.mu.Unlock()
 	if o.node != nil {
 		o.node.Delete()
 		o.node = nil
 	}
-	defer o.mu.Unlock()
 }
 
 // Lock should be held.
diff --git a/server/stream.go b/server/stream.go
index c2f708ddfa7..c5cd88a9d0b 100644
--- a/server/stream.go
+++ b/server/stream.go
@@ -3240,7 +3240,7 @@ func (mset *stream) internalLoop() {
 			c.flushClients(0)
 			outq.recycle(&pms)
 		case <-msgs.ch:
-			// This can possible change now so needs to be checked here.
+			// This can possibly change now so needs to be checked here.
 			mset.mu.RLock()
 			isClustered := mset.node != nil
 			mset.mu.RUnlock()