diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index 3d28059..5921711 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -74,12 +74,18 @@ export default {
 		})
 
 		this.$events.on('show-task-modal', ({task, editMode, masterTask}) => {
+			if(task && task.id) {
+				const id = task.id
+				this.$router.push({ query: { 'task': id }})
+			}
 			this.$refs['z-task-modal'].showModal(task, editMode, masterTask)
 		})
 
 		this.$events.on('show-master-task-modal', ({ masterTask, editMode }) => {
-			const id = masterTask.id
-			this.$router.push({ query: { 'master-task': id } })
+			if (masterTask && masterTask.id) {
+				const id = masterTask.id
+				this.$router.push({ query: { 'master-task': id } })
+			}
 			this.$refs['z-master-task-modal'].showModal(masterTask, editMode)
 		})