diff --git a/src/components/task.vue b/src/components/task.vue
index f507eec88..06eda19c4 100644
--- a/src/components/task.vue
+++ b/src/components/task.vue
@@ -567,7 +567,7 @@ export default {
         this.task.interstitial_screen['_interstitial'] = true;
         this.screen = this.task.interstitial_screen;
       }
-      if (this.task.bpmn_tag_name === 'manualTask') {
+      if (this.task?.bpmn_tag_name === 'manualTask') {
         this.checkTaskStatus();
         this.reload();
       }
@@ -808,6 +808,7 @@ export default {
 
       if (data?.params[0]?.tokenId) {
         this.loadingTask = true;
+        this.nodeId = data.params[0].nodeId;
         this.taskId = data.params[0].tokenId;
         this.reload();
       }