diff --git a/storage/remote/codec.go b/storage/remote/codec.go
index d68c442e5e..cf43c390fe 100644
--- a/storage/remote/codec.go
+++ b/storage/remote/codec.go
@@ -91,10 +91,13 @@ func ToQuery(from, to int64, matchers []*labels.Matcher, p *storage.SelectParams
 	if err != nil {
 		return nil, err
 	}
+	var rp *prompb.ReadHints = nil
 
-	rp := &prompb.ReadHints{
-		StepMs: p.Step,
-		Func:   p.Func,
+	if p != nil {
+		rp = &prompb.ReadHints{
+			StepMs: p.Step,
+			Func:   p.Func,
+		}
 	}
 
 	return &prompb.Query{