diff --git a/crates/bindings-csharp/BSATN.Runtime/Builtins.cs b/crates/bindings-csharp/BSATN.Runtime/Builtins.cs
index ec2331aa6a8..e204985b54a 100644
--- a/crates/bindings-csharp/BSATN.Runtime/Builtins.cs
+++ b/crates/bindings-csharp/BSATN.Runtime/Builtins.cs
@@ -1,8 +1,10 @@
 namespace SpacetimeDB;
 
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using SpacetimeDB.BSATN;
+#if !NET5_0_OR_GREATER
+using System.Diagnostics;
+#endif
 
 internal static class Util
 {
diff --git a/crates/bindings-csharp/BSATN.Runtime/QueryBuilder.cs b/crates/bindings-csharp/BSATN.Runtime/QueryBuilder.cs
index 45f481847b4..db16bd56cd7 100644
--- a/crates/bindings-csharp/BSATN.Runtime/QueryBuilder.cs
+++ b/crates/bindings-csharp/BSATN.Runtime/QueryBuilder.cs
@@ -877,10 +877,14 @@ public static string FormatStringLiteral(ReadOnlySpan<char> value) =>
 
     public static string FormatHexLiteral(string hex)
     {
+#if NET6_0_OR_GREATER
+        ArgumentNullException.ThrowIfNull(hex);
+#else
         if (hex is null)
         {
             throw new ArgumentNullException(nameof(hex));
         }
+#endif
 
         var s = hex;
         if (s.StartsWith("0x", StringComparison.OrdinalIgnoreCase))