diff --git a/Radzen.Blazor.Tests/ChatTests.cs b/Radzen.Blazor.Tests/ChatTests.cs
index 04f3e3d8d..f83e106b9 100644
--- a/Radzen.Blazor.Tests/ChatTests.cs
+++ b/Radzen.Blazor.Tests/ChatTests.cs
@@ -48,6 +48,20 @@ namespace Radzen.Blazor.Tests
             Assert.Contains("Chat Badge", component.Markup);
         }
 
+        [Fact]
+        public void RadzenChat_ShouldNotRenderTitleSpanWhenNoTitle()
+        {
+            using var ctx = new TestContext();
+            ctx.JSInterop.Mode = JSRuntimeMode.Loose;
+            var component = ctx.RenderComponent<RadzenChat>(parameters => parameters
+                .Add(p => p.CurrentUserId, "user1")
+                .Add(p => p.Users, new List<ChatUser>())
+                .Add(p => p.Messages, new List<ChatMessage>())
+            );
+
+            Assert.DoesNotContain("rz-chat-header-title", component.Markup);
+        }
+
         [Fact]
         public void RadzenChat_ShouldShowEmptyMessageWhenNoMessages()
         {
diff --git a/Radzen.Blazor/RadzenChat.razor b/Radzen.Blazor/RadzenChat.razor
index fe17c72c2..5a26d6bf9 100644
--- a/Radzen.Blazor/RadzenChat.razor
+++ b/Radzen.Blazor/RadzenChat.razor
@@ -12,16 +12,14 @@
         {       
             <RadzenStack class="rz-chat-header" Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.SpaceBetween" Gap="0.5rem">
                 <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" Gap="0.5rem">
-                    <span class="rz-chat-header-title">
                     @if (TitleContent != null)
                     {
-                        @TitleContent
+                        <span class="rz-chat-header-title">@TitleContent</span>
                     }
                     else if (!string.IsNullOrWhiteSpace(Title))
                     {
-                        @Title
+                        <span class="rz-chat-header-title">@Title</span>
                     }
-                    </span>
                     @if (ShowUsers && Users.Any())
                     {
                         <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" Gap="0.25rem" class="rz-chat-users">
diff --git a/RadzenBlazorDemos/Pages/ChatTitle.razor b/RadzenBlazorDemos/Pages/ChatTitle.razor
index 744c4a6a4..c55e28f26 100644
--- a/RadzenBlazorDemos/Pages/ChatTitle.razor
+++ b/RadzenBlazorDemos/Pages/ChatTitle.razor
@@ -21,7 +21,7 @@
                 ChatCleared="@OnChatCleared"
                 TypingChanged="@OnTypingChanged">
         <TitleContent>
-            <RadzenBadge>Chat Title Bade</RadzenBadge>
+            <RadzenBadge>Chat Title Badge</RadzenBadge>
         </TitleContent>
     </RadzenChat>
 </RadzenStack>