diff --git a/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/Query.cs b/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/Query.cs
index 1734cc5e8bb..211806516d2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/Query.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/Query.cs
@@ -14,10 +14,10 @@ public partial class Query
 
 	public static bool operator true(Query _) => false;
 
-	public static Query operator &(Query leftContainer, Query rightContainer) =>
+	public static Query operator &(Query? leftContainer, Query? rightContainer) =>
 		And(leftContainer, rightContainer);
 
-	internal static Query And(Query leftContainer, Query rightContainer)
+	internal static Query And(Query? leftContainer, Query? rightContainer)
 	{
 		if (leftContainer is null && rightContainer is null)
 		{
@@ -25,7 +25,7 @@ internal static Query And(Query leftContainer, Query rightContainer)
 		}
 
 		if (rightContainer is null)
-			return leftContainer;
+			return leftContainer!;
 
 		if (leftContainer is null)
 			return rightContainer;
@@ -33,9 +33,9 @@ internal static Query And(Query leftContainer, Query rightContainer)
 		return leftContainer.CombineAsMust(rightContainer);
 	}
 
-	public static Query operator |(Query leftContainer, Query rightContainer) => Or(leftContainer, rightContainer);
+	public static Query operator |(Query? leftContainer, Query? rightContainer) => Or(leftContainer, rightContainer);
 
-	internal static Query Or(Query leftContainer, Query rightContainer)
+	internal static Query Or(Query? leftContainer, Query? rightContainer)
 	{
 		if (leftContainer is null && rightContainer is null)
 		{
@@ -43,7 +43,7 @@ internal static Query Or(Query leftContainer, Query rightContainer)
 		}
 
 		if (rightContainer is null)
-			return leftContainer;
+			return leftContainer!;
 
 		if (leftContainer is null)
 			return rightContainer;
@@ -51,11 +51,11 @@ internal static Query Or(Query leftContainer, Query rightContainer)
 		return leftContainer.CombineAsShould(rightContainer);
 	}
 
-	public static Query operator !(Query queryContainer) => queryContainer is null
+	public static Query? operator !(Query? queryContainer) => queryContainer is null
 			? null
 			: new() { Bool = new() { MustNot = [queryContainer] } };
 
-	public static Query operator +(Query queryContainer) => queryContainer is null
+	public static Query? operator +(Query? queryContainer) => queryContainer is null
 		? null
 		: new() { Bool = new() { Filter = [queryContainer] } };
 }