diff --git a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
index 786c365cd6..f9e2243ba0 100644
--- a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
@@ -83,7 +83,7 @@
       _class,
       { _id },
       async (result) => {
-        if (saveTrigger !== undefined) {
+        if (saveTrigger !== undefined && lastId !== _id) {
           clearTimeout(saveTrigger)
           await save()
         }
@@ -101,6 +101,7 @@
 
   let saved = false
   async function save () {
+    clearTimeout(saveTrigger)
     if (!issue || !canSave) {
       return
     }
diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
index 9271cea639..76bbe9fc94 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
@@ -39,7 +39,7 @@
   const listProvider = new ListSelectionProvider((offset: 1 | -1 | 0, of?: Doc, dir?: SelectDirection) => {
     if (dir === 'vertical') {
       // Select next
-      list.select(offset, of)
+      list?.select(offset, of)
     }
   })
 </script>