diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
index 55b879f296..6f6a1f18f0 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
@@ -72,7 +72,7 @@
 
 <Card
   label={tracker.string.TimeSpendReportAdd}
-  canSave={data.value !== 0}
+  canSave={Number.isFinite(data.value) && data.value !== 0}
   okAction={create}
   on:close
   okLabel={value === undefined ? presentation.string.Create : presentation.string.Save}
diff --git a/plugins/view-resources/src/components/NumberEditor.svelte b/plugins/view-resources/src/components/NumberEditor.svelte
index 4ecdf6a1c0..af2a4ee4da 100644
--- a/plugins/view-resources/src/components/NumberEditor.svelte
+++ b/plugins/view-resources/src/components/NumberEditor.svelte
@@ -30,7 +30,10 @@
   let shown: boolean = false
 
   function _onchange (ev: Event) {
-    onChange((ev.target as HTMLInputElement).valueAsNumber)
+    const value = (ev.target as HTMLInputElement).valueAsNumber
+    if (Number.isFinite(value)) {
+      onChange(value)
+    }
   }
 </script>
 
@@ -40,7 +43,7 @@
     on:click={(ev) => {
       if (!shown && !readonly) {
         showPopup(EditBoxPopup, { value, format: 'number' }, eventToHTMLElement(ev), (res) => {
-          if (res !== undefined) {
+          if (Number.isFinite(res)) {
             value = res
             onChange(value)
           }