diff --git a/BlazorApp/Pages/Calendar.razor b/BlazorApp/Pages/Calendar.razor
index 331127f..ff79110 100644
--- a/BlazorApp/Pages/Calendar.razor
+++ b/BlazorApp/Pages/Calendar.razor
@@ -14,20 +14,28 @@
 else
 {
     <h1>Calendar "@_calendar.Name"</h1>
-    @foreach (var e in _events)
+    @foreach (var @event in _events)
     {
         <div class="event">
-            <a href="/calendars/@Id/events/@e.Uid">
-                <h2>@e.Summary</h2>
+            <a href="/calendars/@Id/events/@(@event.Uid)">
+                <h2>@(@event.Summary)</h2>
             </a>
 
-            <div>
-                <strong>Start:</strong> @e.DtStart
-            </div>
-            <div>
-                <strong>End:</strong> @e.DtEnd
-            </div>
-            <div class="event-description-short">@e.Description</div>
+            @if (@event.DtStart != null)
+            {
+                <div>
+                    <strong>Start:</strong> @(@event.DtStart)
+                </div>
+            }
+            
+            @if (@event.DtEnd != null)
+            {
+                <div>
+                    <strong>End:</strong> @(@event.DtEnd)
+                </div>
+            }
+            
+            <div class="event-description-short">@(@event.Description)</div>
         </div>
     }
 }
diff --git a/BlazorApp/Pages/Event.razor b/BlazorApp/Pages/Event.razor
index 256ecea..3782c1e 100644
--- a/BlazorApp/Pages/Event.razor
+++ b/BlazorApp/Pages/Event.razor
@@ -14,12 +14,21 @@
 else
 {
     <h1>@_event.Summary</h1>
-    <div>
-        <strong>Start:</strong> @_event.DtStart
-    </div>
-    <div>
-        <strong>End:</strong> @_event.DtEnd
-    </div>
+
+    @if (_event.DtStart != null)
+    {
+        <div>
+            <strong>Start:</strong> @_event.DtStart
+        </div>
+    }
+
+    @if (_event.DtEnd != null)
+    {
+        <div>
+            <strong>End:</strong> @_event.DtEnd
+        </div>
+    }
+
     <p class="event-description">@_event.Description</p>
 }