diff --git a/src/lib/components/event/event-summary-row.svelte b/src/lib/components/event/event-summary-row.svelte
index 6ca441c09..64f61cb2b 100644
--- a/src/lib/components/event/event-summary-row.svelte
+++ b/src/lib/components/event/event-summary-row.svelte
@@ -105,7 +105,7 @@
           {/if}
         </p>
         {#if duration && duration !== '0ms'}
-          <div class="flex flex-row items-center gap-0">
+          <div class="flex flex-row items-center gap-1">
             <Icon class="inline" name="clock" />
             <p class="break-word truncate text-sm md:whitespace-normal">
               {duration}
diff --git a/src/lib/utilities/is-event-type.ts b/src/lib/utilities/is-event-type.ts
index 64ceecd54..acdc657b7 100644
--- a/src/lib/utilities/is-event-type.ts
+++ b/src/lib/utilities/is-event-type.ts
@@ -199,8 +199,8 @@ export const findAttributesAndKey = (
 
 const hasAttributes =
   <T extends EventWithAttributes<EventAttributeKey>>(key: EventAttributeKey) =>
-  (event: IterableEvent | CommonHistoryEvent): event is T => {
-    return Boolean(event[key]);
+  (event: IterableEvent | CommonHistoryEvent | undefined): event is T => {
+    return Boolean(event?.[key]);
   };
 
 export const isWorkflowExecutionStartedEvent =