diff --git a/server/filestore.go b/server/filestore.go
index 8be8ff8e..11321386 100644
--- a/server/filestore.go
+++ b/server/filestore.go
@@ -3509,7 +3509,9 @@ func (fs *fileStore) removeMsg(seq uint64, secure, viaLimits, needFSLock bool) (
 	}
 
 	cb := fs.scb
-	fsUnlock()
+	if !needFSLock {
+		fs.mu.Unlock()
+	}
 
 	// Storage updates.
 	if cb != nil {