diff --git a/internal/store/messages.go b/internal/store/messages.go
index b17c1a5..23fbe25 100644
--- a/internal/store/messages.go
+++ b/internal/store/messages.go
@@ -482,6 +482,10 @@ func (s *Store) BackfillSearchIndex(ctx context.Context, limit int) (int, error)
 		}
 		items = append(items, item)
 	}
+	if err := rows.Err(); err != nil {
+		_ = rows.Close()
+		return 0, err
+	}
 	if err := rows.Close(); err != nil {
 		return 0, err
 	}