1 files changed, 6 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
index 126f61402..959d294c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
@@ -105,10 +105,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
             IsRealTime = true;
             RealTimePaused = true;
 
-            SelectedDate = Dates.Last();
+            SelectedDate = Dates.LastOrDefault();
 
-            MinDate = Dates.Min();
-            MaxDate = Dates.Max();
+            if (Dates.Count > 0)
+            {
+                MinDate = Dates.Min();
+                MaxDate = Dates.Max();
+            }
 
             MachineOperator.EmbeddedLogManager.NewLog += EmbeddedLogManager_NewLog;