diff --git a/holder.go b/holder.go
index a6db1e76a..c3e6ff01a 100644
--- a/holder.go
+++ b/holder.go
@@ -782,12 +782,8 @@ func (h *Holder) Close() error {
 func (h *Holder) NeedsSnapshot() bool {
 	h.mu.RLock()
 	defer h.mu.RUnlock()
-	for _, idx := range h.Indexes() {
-		if idx.NeedsSnapshot() {
-			return true
-		}
-	}
-	return false
+
+	return h.txf.NeedsSnapshot()
 }
 
 // HasData returns true if Holder contains at least one index.
diff --git a/server.go b/server.go
index 6fc01ebe7..89d197fef 100644
--- a/server.go
+++ b/server.go
@@ -88,7 +88,7 @@ type Server struct { // nolint: maligned
 	dataDir       string
 
 	// Threshold for logging long-running queries
-	longQueryTime time.Duration
+	longQueryTime      time.Duration
 	queryHistoryLength int
 }