diff --git a/client/src/common/input/TimeInput.jsx b/client/src/common/input/TimeInput.jsx
index 19c3ca2db..9ac84a6ef 100644
--- a/client/src/common/input/TimeInput.jsx
+++ b/client/src/common/input/TimeInput.jsx
@@ -17,7 +17,7 @@ export default function TimeInput(props) {
   const [value, setValue] = useState(props.value);
 
   useEffect(() => {
-    if (props.value === null) return;
+    if (props.value == null) return;
     setValue(props.value);
   }, [props.value]);
 
diff --git a/client/src/features/editors/list/DelayBlock.jsx b/client/src/features/editors/list/DelayBlock.jsx
index 4711c26ad..12f3b8855 100644
--- a/client/src/features/editors/list/DelayBlock.jsx
+++ b/client/src/features/editors/list/DelayBlock.jsx
@@ -20,10 +20,11 @@ export default function DelayBlock(props) {
     eventsHandler('delete', data.id);
   };
 
+  let delayValue = (data.duration != null) ? millisToMinutes(data.duration) : undefined;
   return (
     <div className={style.delay}>
       <TimeInput
-        value={millisToMinutes(data.duration)}
+        value={delayValue}
         submitHandler={submitHandler}
       />
       <div className={style.actionOverlay}>