From 2a9d93a3d52789749478cd4c6904f41af75922e2 Mon Sep 17 00:00:00 2001
From: Emre KARA <emre@ekara.dev>
Date: Wed, 6 Aug 2025 10:43:24 +0300
Subject: [PATCH] Filter null activities after deserialization

---
 .../Telemetry/Activity/Storage/TelemetryActivityStorage.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs
index 2ccc0e552d..70455b2d45 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Storage/TelemetryActivityStorage.cs
@@ -178,7 +178,9 @@ public class TelemetryActivityStorage : ITelemetryActivityStorage, ISingletonDep
 
             var json = Cryptography.Decrypt(fileContent);
 
-            return JsonSerializer.Deserialize<TelemetryActivityStorageState>(json, JsonSerializerOptions)!;
+            var state = JsonSerializer.Deserialize<TelemetryActivityStorageState>(json, JsonSerializerOptions)!;
+            state.Activities = state.Activities.Where(x => x != null).ToList();
+            return state;
         }
         catch
         {