diff --git a/client/src/features/editors/list/EventBlock.jsx b/client/src/features/editors/list/EventBlock.jsx
index 14ed785ce..2a0d2e1c8 100644
--- a/client/src/features/editors/list/EventBlock.jsx
+++ b/client/src/features/editors/list/EventBlock.jsx
@@ -15,7 +15,8 @@ const areEqual = (prevProps, nextProps) => {
     prevProps.data.revision === nextProps.data.revision &&
     prevProps.selected === nextProps.selected &&
     prevProps.next === nextProps.next &&
-    prevProps.index === nextProps.index
+    prevProps.index === nextProps.index &&
+    prevProps.delay === nextProps.delay
   );
 };
 
diff --git a/client/src/features/editors/list/EventList.jsx b/client/src/features/editors/list/EventList.jsx
index 8cacba9df..50176d63f 100644
--- a/client/src/features/editors/list/EventList.jsx
+++ b/client/src/features/editors/list/EventList.jsx
@@ -128,8 +128,10 @@ export default function EventList(props) {
               ref={provided.innerRef}
             >
               {events.map((e, index) => {
-                if (e.type === 'delay') cumulativeDelay += e.duration;
-                else if (e.type === 'block') cumulativeDelay = 0;
+                if (index === 0) cumulativeDelay = 0;
+                if (e.type === 'delay' && e.duration != null) {
+                  cumulativeDelay += e.duration;
+                } else if (e.type === 'block') cumulativeDelay = 0;
                 return (
                   <Fragment key={e.id}>
                     <EventListItem