diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index e2ee4dd67f..95af0ed9f0 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -260,13 +260,7 @@
                             <StackPanel Orientation="Horizontal" Spacing="2" HorizontalAlignment="Left">
                               <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
-                              <ContentControl Content="{Binding Value}">
-                                <ContentControl.ContentTemplate>
-                                  <DataTemplate x:DataType="system:Object">
-                                    <TextBlock Text="{Binding}" />
-                                  </DataTemplate>
-                                </ContentControl.ContentTemplate>
-                              </ContentControl>
+                              <TextBlock Text="{Binding Value}" />
                               <TextBlock>(</TextBlock>
                               <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
                               <TextBlock FontStyle="Italic" Text="{Binding Key}" />
@@ -287,13 +281,7 @@
                             <StackPanel Orientation="Horizontal" Spacing="2">
                               <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
-                              <ContentControl Content="{Binding Value}">
-                                <ContentControl.ContentTemplate>
-                                  <DataTemplate x:DataType="system:Object">
-                                    <TextBlock Text="{Binding}" />
-                                  </DataTemplate>
-                                </ContentControl.ContentTemplate>
-                              </ContentControl>
+                              <TextBlock Text="{Binding Value}" />
                             </StackPanel>
                             <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>