diff --git a/src/Artemis.Core/Stores/LogStore.cs b/src/Artemis.Core/Stores/LogStore.cs
index 856ecd6fe..24079b98e 100644
--- a/src/Artemis.Core/Stores/LogStore.cs
+++ b/src/Artemis.Core/Stores/LogStore.cs
@@ -25,7 +25,7 @@ namespace Artemis.Core
         internal static void Emit(LogEvent logEvent)
         {
             LinkedList.AddLast(logEvent);
-            if (LinkedList.Count > 500)
+            while (LinkedList.Count > 500)
                 LinkedList.RemoveFirst();
 
             OnEventAdded(new LogEventEventArgs(logEvent));
diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
index f2c0b8995..f178ca853 100644
--- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
@@ -69,8 +69,7 @@
         <TreeView Grid.Row="1" 
                   ItemsSource="{Binding MainDataModel.Children}"
                   HorizontalContentAlignment="Stretch"
-                  VirtualizingStackPanel.IsVirtualizing="True"
-                  VirtualizingStackPanel.VirtualizationMode="Recycling">
+                  VirtualizingStackPanel.IsVirtualizing="True">
             <TreeView.Resources>
                 <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource MaterialDesignTreeViewItem}">
                     <Setter Property="IsExpanded" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />