diff --git a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
index 4bb434e16c..de1536189c 100644
--- a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
+++ b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
@@ -372,7 +372,7 @@ public partial class FluentDataGrid<TGridItem> : FluentComponentBase, IHandleEve
 
     // Returns Loading if set (controlled). If not controlled,
     // we assume the grid is loading until the next data load completes
-    internal bool EffectiveLoadingValue => Loading ?? ItemsProvider is not null;
+    internal bool EffectiveLoadingValue => Loading ?? (ItemsProvider is not null);
 
     private ElementReference? _gridReference;
     //private DotNetObjectReference<Type>? _dotNetObjectReference;
diff --git a/src/Core/Components/MessageBar/Services/MessageService.cs b/src/Core/Components/MessageBar/Services/MessageService.cs
index bff1e4e9b4..93a262e24a 100644
--- a/src/Core/Components/MessageBar/Services/MessageService.cs
+++ b/src/Core/Components/MessageBar/Services/MessageService.cs
@@ -46,7 +46,7 @@ public virtual IEnumerable<Message> AllMessages
             MessageLock.EnterReadLock();
             try
             {
-                return MessageList;
+                return MessageList.ToList();
             }
             finally
             {
@@ -66,11 +66,19 @@ public virtual IEnumerable<Message> MessagesToShow(int count = 5, string? sectio
         MessageLock.EnterReadLock();
         try
         {
-            var messages = string.IsNullOrEmpty(section)
-                       ? MessageList
-                       : MessageList.Where(x => x.Section == section);
+            IEnumerable<Message> messages = MessageList;
 
-            return count > 0 ? messages.Take(count) : messages;
+            if (!string.IsNullOrEmpty(section))
+            {
+                messages = messages.Where(x => x.Section == section);
+            }
+
+            if (count > 0)
+            {
+                messages = messages.Take(count);
+            }
+
+            return messages.ToList();
         }
         finally
         {
@@ -263,7 +271,10 @@ public virtual async Task<Message> ShowMessageBarAsync(Action<MessageOptions> op
             MessageLock.ExitWriteLock();
         }
 
-        await OnMessageItemsUpdatedAsync!.Invoke();
+        if (OnMessageItemsUpdatedAsync is { } handler)
+        {
+            await handler.Invoke();
+        }
 
         return message;
     }