diff --git a/BlazorApp/Data/Calendar.cs b/BlazorApp/Data/Calendar.cs
index 0a12e8b..1b8581c 100644
--- a/BlazorApp/Data/Calendar.cs
+++ b/BlazorApp/Data/Calendar.cs
@@ -122,15 +122,18 @@ namespace BlazorApp.Data
             client.DefaultRequestHeaders.Add("Authorization", AuthorizationHeader);
             var body = await client.GetStringAsync(Url);
             var events = ParseICal(body);
+            
+            var now = DateTime.Now;
+            events = events.FindAll(@event => @event.DtStart > now || @event.DtEnd > now);
 
             events.Sort((x, y) =>
             {
-                if (y.DtStart == null)
-                    return -1;
                 if (x.DtStart == null)
+                    return -1;
+                if (y.DtStart == null)
                     return 1;
                 
-                return DateTime.Compare(y.DtStart.Value, x.DtStart.Value);
+                return DateTime.Compare(x.DtStart.Value, y.DtStart.Value);
             });
 
             return events;