diff --git a/src/NRedisStack/PublicAPI/PublicAPI.Shipped.txt b/src/NRedisStack/PublicAPI/PublicAPI.Shipped.txt
index a53931b5..8652ade9 100644
--- a/src/NRedisStack/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/NRedisStack/PublicAPI/PublicAPI.Shipped.txt
@@ -525,6 +525,8 @@ NRedisStack.Literals.Enums.TsAggregation.StdP = 8 -> NRedisStack.Literals.Enums.
 NRedisStack.Literals.Enums.TsAggregation.StdS = 9 -> NRedisStack.Literals.Enums.TsAggregation
 NRedisStack.Literals.Enums.TsAggregation.Sum = 1 -> NRedisStack.Literals.Enums.TsAggregation
 NRedisStack.Literals.Enums.TsAggregation.Twa = 12 -> NRedisStack.Literals.Enums.TsAggregation
+NRedisStack.Literals.Enums.TsAggregation.CountNan = 13 -> NRedisStack.Literals.Enums.TsAggregation
+NRedisStack.Literals.Enums.TsAggregation.CountAll = 14 -> NRedisStack.Literals.Enums.TsAggregation
 NRedisStack.Literals.Enums.TsAggregation.VarP = 10 -> NRedisStack.Literals.Enums.TsAggregation
 NRedisStack.Literals.Enums.TsAggregation.VarS = 11 -> NRedisStack.Literals.Enums.TsAggregation
 NRedisStack.Literals.Enums.TsBucketTimestamps
diff --git a/src/NRedisStack/TimeSeries/Extensions/AggregationExtensions.cs b/src/NRedisStack/TimeSeries/Extensions/AggregationExtensions.cs
index cd22dfaf..65ccd0d6 100644
--- a/src/NRedisStack/TimeSeries/Extensions/AggregationExtensions.cs
+++ b/src/NRedisStack/TimeSeries/Extensions/AggregationExtensions.cs
@@ -19,6 +19,8 @@ internal static class AggregationExtensions
         TsAggregation.VarP => "var.p",
         TsAggregation.VarS => "var.s",
         TsAggregation.Twa => "twa",
+        TsAggregation.CountNan => "countnan",
+        TsAggregation.CountAll => "countall",
         _ => throw new ArgumentOutOfRangeException(nameof(aggregation), "Invalid aggregation type"),
     };
 
@@ -50,6 +52,8 @@ internal static class AggregationExtensions
         "VAR.P" => TsAggregation.VarP,
         "VAR.S" => TsAggregation.VarS,
         "TWA" => TsAggregation.Twa,
+        "COUNTNAN" => TsAggregation.CountNan,
+        "COUNTALL" => TsAggregation.CountAll,
         _ => throw new ArgumentOutOfRangeException(nameof(aggregation), $"Invalid aggregation type '{aggregation}'"),
     };
 }
\ No newline at end of file
diff --git a/src/NRedisStack/TimeSeries/Literals/Enums/Aggregation.cs b/src/NRedisStack/TimeSeries/Literals/Enums/Aggregation.cs
index 8e94ddf4..b14fd418 100644
--- a/src/NRedisStack/TimeSeries/Literals/Enums/Aggregation.cs
+++ b/src/NRedisStack/TimeSeries/Literals/Enums/Aggregation.cs
@@ -74,4 +74,16 @@ public enum TsAggregation
     /// Time-weighted average of all values
     /// </summary>
     Twa,
+
+    /// <summary>
+    /// Count of NaN values in the aggregation bucket
+    /// </summary>
+    /// <remarks>Available since Redis 8.6.0</remarks>
+    CountNan,
+
+    /// <summary>
+    /// Count of all values (including NaN) in the aggregation bucket
+    /// </summary>
+    /// <remarks>Available since Redis 8.6.0</remarks>
+    CountAll,
 }
\ No newline at end of file
diff --git a/src/NRedisStack/TimeSeries/TimeSeriesAux.cs b/src/NRedisStack/TimeSeries/TimeSeriesAux.cs
index 232e54f5..7a944e4a 100644
--- a/src/NRedisStack/TimeSeries/TimeSeriesAux.cs
+++ b/src/NRedisStack/TimeSeries/TimeSeriesAux.cs
@@ -2,6 +2,7 @@
 using NRedisStack.Literals.Enums;
 using NRedisStack.DataTypes;
 using NRedisStack.Extensions;
+using StackExchange.Redis;
 
 namespace NRedisStack;
 
@@ -195,7 +196,7 @@ public static List<object> BuildRangeArgs(string key,
         TsBucketTimestamps? bt,
         bool empty)
     {
-        var args = new List<object>() { key, fromTimeStamp.Value, toTimeStamp.Value };
+        var args = new List<object>() { (RedisKey)key, fromTimeStamp.Value, toTimeStamp.Value };
         args.AddLatest(latest);
         args.AddFilterByTs(filterByTs);
         args.AddFilterByValue(filterByValue);
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRange.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRange.cs
index 8f1d27ac..43b74adf 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRange.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRange.cs
@@ -277,4 +277,48 @@ public void TestEmpty()
             Assert.Equal(range[i].Val, expected[i].Val);
         }
     }
+
+    [SkipIfRedisTheory(Comparison.LessThan, "8.5.0")]
+    [MemberData(nameof(EndpointsFixture.Env.AllEnvironments), MemberType = typeof(EndpointsFixture.Env))]
+    public void TestRangeCountNanAggregation(string endpointId)
+    {
+        IDatabase db = GetCleanDatabase(endpointId);
+        var ts = db.TS();
+        var key = CreateKeyName();
+
+        // Create a time series and add data including NaN values
+        ts.Create(key);
+        ts.Add(key, 10, 1.0);
+        ts.Add(key, 20, double.NaN);
+        ts.Add(key, 30, 3.0);
+        ts.Add(key, 40, double.NaN);
+        ts.Add(key, 50, 5.0);
+
+        // Test CountNan aggregation - should count NaN values
+        var range = ts.Range(key, 0, 100, aggregation: TsAggregation.CountNan, timeBucket: 100);
+        Assert.Single(range);
+        Assert.Equal(2, range[0].Val); // 2 NaN values
+    }
+
+    [SkipIfRedisTheory(Comparison.LessThan, "8.5.0")]
+    [MemberData(nameof(EndpointsFixture.Env.AllEnvironments), MemberType = typeof(EndpointsFixture.Env))]
+    public void TestRangeCountAllAggregation(string endpointId)
+    {
+        IDatabase db = GetCleanDatabase(endpointId);
+        var ts = db.TS();
+        var key = CreateKeyName();
+
+        // Create a time series and add data including NaN values
+        ts.Create(key);
+        ts.Add(key, 10, 1.0);
+        ts.Add(key, 20, double.NaN);
+        ts.Add(key, 30, 3.0);
+        ts.Add(key, 40, double.NaN);
+        ts.Add(key, 50, 5.0);
+
+        // Test CountAll aggregation - should count all values including NaN
+        var range = ts.Range(key, 0, 100, aggregation: TsAggregation.CountAll, timeBucket: 100);
+        Assert.Single(range);
+        Assert.Equal(5, range[0].Val); // 5 total values (3 regular + 2 NaN)
+    }
 }
\ No newline at end of file
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRangeAsync.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRangeAsync.cs
index 880ad648..a556140f 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRangeAsync.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRangeAsync.cs
@@ -283,4 +283,48 @@ public async Task TestEmptyAsync()
             Assert.Equal(range[i].Val, expected[i].Val);
         }
     }
+
+    [SkipIfRedisTheory(Comparison.LessThan, "8.5.0")]
+    [MemberData(nameof(EndpointsFixture.Env.AllEnvironments), MemberType = typeof(EndpointsFixture.Env))]
+    public async Task TestRangeCountNanAggregationAsync(string endpointId)
+    {
+        IDatabase db = GetCleanDatabase(endpointId);
+        var ts = db.TS();
+        var key = CreateKeyName();
+
+        // Create a time series and add data including NaN values
+        await ts.CreateAsync(key);
+        await ts.AddAsync(key, 10, 1.0);
+        await ts.AddAsync(key, 20, double.NaN);
+        await ts.AddAsync(key, 30, 3.0);
+        await ts.AddAsync(key, 40, double.NaN);
+        await ts.AddAsync(key, 50, 5.0);
+
+        // Test CountNan aggregation - should count NaN values
+        var range = await ts.RangeAsync(key, 0, 100, aggregation: TsAggregation.CountNan, timeBucket: 100);
+        Assert.Single(range);
+        Assert.Equal(2, range[0].Val); // 2 NaN values
+    }
+
+    [SkipIfRedisTheory(Comparison.LessThan, "8.5.0")]
+    [MemberData(nameof(EndpointsFixture.Env.AllEnvironments), MemberType = typeof(EndpointsFixture.Env))]
+    public async Task TestRangeCountAllAggregationAsync(string endpointId)
+    {
+        IDatabase db = GetCleanDatabase(endpointId);
+        var ts = db.TS();
+        var key = CreateKeyName();
+
+        // Create a time series and add data including NaN values
+        await ts.CreateAsync(key);
+        await ts.AddAsync(key, 10, 1.0);
+        await ts.AddAsync(key, 20, double.NaN);
+        await ts.AddAsync(key, 30, 3.0);
+        await ts.AddAsync(key, 40, double.NaN);
+        await ts.AddAsync(key, 50, 5.0);
+
+        // Test CountAll aggregation - should count all values including NaN
+        var range = await ts.RangeAsync(key, 0, 100, aggregation: TsAggregation.CountAll, timeBucket: 100);
+        Assert.Single(range);
+        Assert.Equal(5, range[0].Val); // 5 total values (3 regular + 2 NaN)
+    }
 }
\ No newline at end of file
diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRulesAsync.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRulesAsync.cs
index 4df57d54..d3fdb66d 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRulesAsync.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestRulesAsync.cs
@@ -18,7 +18,11 @@ public async Task TestRulesAdditionDeletion(string endpointId)
         var db = GetCleanDatabase(endpointId);
         var ts = db.TS();
         await ts.CreateAsync(key);
-        var aggregations = (TsAggregation[])Enum.GetValues(typeof(TsAggregation));
+        var allAggregations = (TsAggregation[])Enum.GetValues(typeof(TsAggregation));
+        // Filter out CountNan and CountAll on Redis versions < 8.6.0 as they are not supported
+        var aggregations = EndpointsFixture.RedisVersion >= new Version("8.5.0")
+            ? allAggregations
+            : allAggregations.Where(a => a != TsAggregation.CountNan && a != TsAggregation.CountAll).ToArray();
 
         foreach (var aggregation in aggregations)
         {