diff --git a/server/filestore.go b/server/filestore.go
index 6d071e93..771b5aaa 100644
--- a/server/filestore.go
+++ b/server/filestore.go
@@ -2991,7 +2991,9 @@ func (fs *fileStore) removeMsg(seq uint64, secure, viaLimits, needFSLock bool) (
 			fmb.writeIndexInfo()
 		}
 	}
-	fs.mu.Unlock()
+	if !needFSLock {
+		fs.mu.Unlock()
+	}
 
 	// Storage updates.
 	if cb != nil {