1 files changed, 3 insertions, 4 deletions
diff --git a/LibMatrix/Helpers/SyncHelper.cs b/LibMatrix/Helpers/SyncHelper.cs
index f95d6f8..adcc714 100644
--- a/LibMatrix/Helpers/SyncHelper.cs
+++ b/LibMatrix/Helpers/SyncHelper.cs
@@ -8,7 +8,6 @@ using LibMatrix.Filters;
 using LibMatrix.Homeservers;
 using LibMatrix.Interfaces.Services;
 using LibMatrix.Responses;
-using LibMatrix.Utilities;
 using Microsoft.Extensions.Logging;
 
 namespace LibMatrix.Helpers;
@@ -16,8 +15,8 @@ namespace LibMatrix.Helpers;
 public class SyncHelper(AuthenticatedHomeserverGeneric homeserver, ILogger? logger = null, IStorageProvider? storageProvider = null) {
     private SyncFilter? _filter;
     private string? _namedFilterName;
-    private bool _filterIsDirty = false;
-    private string? _filterId = null;
+    private bool _filterIsDirty;
+    private string? _filterId;
 
     public string? Since { get; set; }
     public int Timeout { get; set; } = 30000;
@@ -225,7 +224,7 @@ public class SyncHelper(AuthenticatedHomeserverGeneric homeserver, ILogger? logg
         if (syncResponse.Rooms is { Join.Count: > 0 })
             foreach (var updatedRoom in syncResponse.Rooms.Join) {
                 if (updatedRoom.Value.Timeline is null) continue;
-                foreach (var stateEventResponse in updatedRoom.Value.Timeline.Events) {
+                foreach (var stateEventResponse in updatedRoom.Value.Timeline.Events ?? []) {
                     stateEventResponse.RoomId = updatedRoom.Key;
                     var tasks = TimelineEventHandlers.Select(x => x(stateEventResponse)).ToList();
                     await Task.WhenAll(tasks);