diff --git a/CBSVisualizer/CBSVisualizer.Modules.Charts/ViewModels/ChartsViewModel.cs b/CBSVisualizer/CBSVisualizer.Modules.Charts/ViewModels/ChartsViewModel.cs
index b12618da11dc6bbefb4271a0b82cc0fea2dc563e..98a49c33fdf13587c22913e6ee5750d3cd000978 100644
--- a/CBSVisualizer/CBSVisualizer.Modules.Charts/ViewModels/ChartsViewModel.cs
+++ b/CBSVisualizer/CBSVisualizer.Modules.Charts/ViewModels/ChartsViewModel.cs
@@ -5,6 +5,7 @@ using System.Collections.ObjectModel;
 using CBSVisualizer.Core.Mvvm;
 using CBSVisualizer.Messaging.Events;
 using CBSVisualizer.Messaging.Events.Charts;
+using CBSVisualizer.Messaging.Events.Queue;
 using CBSVisualizer.Messaging.Events.Simulation;
 using Prism.Events;
 using Prism.Regions;
@@ -30,6 +31,19 @@ namespace CBSVisualizer.Modules.Charts.ViewModels
             InitCharts();
             InitPacketHandler(eventAggregator);
             InitCreditHandler(eventAggregator);
+            InitClearListener(eventAggregator);
+        }
+
+        private void InitClearListener(IEventAggregator eventAggregator)
+        {
+            eventAggregator.GetEvent<ClearQueuesEvent>().Subscribe(() =>
+            {
+                foreach (var (_, collection) in QueueSeries)
+                {
+                    collection[0]?.DataSeries.Clear();
+                    collection[1]?.DataSeries.Clear();
+                }
+            });
         }
 
         /// <summary>
diff --git a/CBSVisualizer/CBSVisualizer.Modules.Queue/Views/Queue.xaml b/CBSVisualizer/CBSVisualizer.Modules.Queue/Views/Queue.xaml
index a8f91c4c10ac07e1aac3b26add45b34fdb265ad1..a0f4e69c3bca7c9022f13cc56c6c0cd3fc3f0eb9 100644
--- a/CBSVisualizer/CBSVisualizer.Modules.Queue/Views/Queue.xaml
+++ b/CBSVisualizer/CBSVisualizer.Modules.Queue/Views/Queue.xaml
@@ -23,7 +23,7 @@
 
         <TextBox materialDesign:HintAssist.Hint="Idle Slope [byte/s]"
                  Style="{StaticResource MaterialDesignFloatingHintTextBox}"
-                 x:Name="CreditRateTextBox" Text="{Binding IdleSlope}" Grid.Column="1" Grid.RowSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" />
+                 x:Name="CreditRateTextBox" Text="{Binding IdleSlope, UpdateSourceTrigger=PropertyChanged}" Grid.Column="1" Grid.RowSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" />
 
         <ComboBox Style="{StaticResource MaterialDesignFloatingHintComboBox}"
             materialDesign:TextFieldAssist.UnderlineBrush="{DynamicResource SecondaryAccentBrush}"