1 files changed, 2 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs
index c1f87b3bb..e1e9ee561 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineUpdatesViewVM.cs
@@ -19,6 +19,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
     {
         private INotificationProvider _notification;
         private ObservablesContext _context;
+        private const int MAX_UPDATE_ITEMS = 100;
 
         #region Properties
 
@@ -114,7 +115,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             {
                 _context = context;
                 Machine = machine;
-                Updates = (await new TangoUpdatesCollectionBuilder(context).Set(x => x.MachineGuid == machine.Guid).BuildAsync()).OrderByDescending(x => x.StartDate).ToList();
+                Updates = (await new TangoUpdatesCollectionBuilder(context).Set(x => x.MachineGuid == machine.Guid).Query(x => x.OrderByDescending(y => y.StartDate).Take(MAX_UPDATE_ITEMS)).BuildAsync()).ToList();
                 UpdatesView = CollectionViewSource.GetDefaultView(Updates);
                 UpdatesView.Filter = UpdatesFilter;
                 OnFilterChanged();