diff --git a/pkg/logql/optimize.go b/pkg/logql/optimize.go
index 2f9c80a64f918..9b885b0fd229c 100644
--- a/pkg/logql/optimize.go
+++ b/pkg/logql/optimize.go
@@ -8,7 +8,7 @@ func optimizeSampleExpr(expr syntax.SampleExpr) (syntax.SampleExpr, error) {
 	// we skip sharding AST for now, it's not easy to clone them since they are not part of the language.
 	expr.Walk(func(e syntax.Expr) {
 		switch e.(type) {
-		case *ConcatSampleExpr, *DownstreamSampleExpr, *QuantileSketchEvalExpr, *QuantileSketchMergeExpr:
+		case *ConcatSampleExpr, DownstreamSampleExpr, *QuantileSketchEvalExpr, *QuantileSketchMergeExpr:
 			skip = true
 			return
 		}
diff --git a/pkg/logql/shardmapper.go b/pkg/logql/shardmapper.go
index 4a06b5f804e84..e8d78a438c9bb 100644
--- a/pkg/logql/shardmapper.go
+++ b/pkg/logql/shardmapper.go
@@ -128,7 +128,7 @@ func (m ShardMapper) mapBinOpExpr(e *syntax.BinOpExpr, r *downstreamRecorder) (*
 	if err != nil {
 		return nil, 0, err
 	}
-	if isNoOp(e.SampleExpr, rhsMapped) && !isLiteralOrVector(rhsMapped) {
+	if isNoOp(e.RHS, rhsMapped) && !isLiteralOrVector(rhsMapped) {
 		// TODO: check if literal or vector
 		rhsMapped = DownstreamSampleExpr{
 			shard:      nil,
diff --git a/pkg/logql/shardmapper_test.go b/pkg/logql/shardmapper_test.go
index 7a02640c81491..96955109a9413 100644
--- a/pkg/logql/shardmapper_test.go
+++ b/pkg/logql/shardmapper_test.go
@@ -1446,16 +1446,84 @@ func TestMapping(t *testing.T) {
 				},
 			},
 		},
+		{
+			in: `quantile_over_time(0.99, {a="foo"} | unwrap bytes [1s]) by (a, b) > 1`,
+			expr: &syntax.BinOpExpr{
+				SampleExpr: DownstreamSampleExpr{
+					SampleExpr: &syntax.RangeAggregationExpr{
+						Operation: syntax.OpRangeTypeQuantile,
+						Params:    float64p(0.99),
+						Left: &syntax.LogRange{
+							Left: &syntax.MatchersExpr{
+								Mts: []*labels.Matcher{mustNewMatcher(labels.MatchEqual, "a", "foo")},
+							},
+							Unwrap: &syntax.UnwrapExpr{
+								Identifier: "bytes",
+							},
+							Interval: 1 * time.Second,
+						},
+						Grouping: &syntax.Grouping{
+							Groups: []string{"a", "b"},
+						},
+					},
+				},
+				RHS: &syntax.LiteralExpr{
+					Val: 1,
+				},
+				Op: syntax.OpTypeGT,
+				Opts: &syntax.BinOpOptions{
+					ReturnBool:     false,
+					VectorMatching: &syntax.VectorMatching{},
+				},
+			},
+		},
+		{
+			in: `1 < quantile_over_time(0.99, {a="foo"} | unwrap bytes [1s]) by (a, b)`,
+			expr: &syntax.BinOpExpr{
+				SampleExpr: &syntax.LiteralExpr{
+					Val: 1,
+				},
+				RHS: DownstreamSampleExpr{
+					SampleExpr: &syntax.RangeAggregationExpr{
+						Operation: syntax.OpRangeTypeQuantile,
+						Params:    float64p(0.99),
+						Left: &syntax.LogRange{
+							Left: &syntax.MatchersExpr{
+								Mts: []*labels.Matcher{mustNewMatcher(labels.MatchEqual, "a", "foo")},
+							},
+							Unwrap: &syntax.UnwrapExpr{
+								Identifier: "bytes",
+							},
+							Interval: 1 * time.Second,
+						},
+						Grouping: &syntax.Grouping{
+							Groups: []string{"a", "b"},
+						},
+					},
+				},
+				Op: syntax.OpTypeLT,
+				Opts: &syntax.BinOpOptions{
+					ReturnBool:     false,
+					VectorMatching: &syntax.VectorMatching{},
+				},
+			},
+		},
 	} {
 		t.Run(tc.in, func(t *testing.T) {
 			ast, err := syntax.ParseExpr(tc.in)
 			require.Equal(t, tc.err, err)
 
 			mapped, _, err := m.Map(ast, nilShardMetrics.downstreamRecorder())
+			switch e := mapped.(type) {
+			case syntax.SampleExpr:
+				optimized, err := optimizeSampleExpr(e)
+				require.NoError(t, err)
+				require.Equal(t, mapped.String(), optimized.String())
+			}
 
 			require.Equal(t, tc.err, err)
-			require.Equal(t, mapped.String(), tc.expr.String())
-			require.Equal(t, mapped, tc.expr)
+			require.Equal(t, tc.expr.String(), mapped.String())
+			require.Equal(t, tc.expr, mapped)
 		})
 	}
 }