diff --git a/camunda-formio-tasklist-vue/package.json b/camunda-formio-tasklist-vue/package.json
index 6bc5ab0..3a191b7 100644
--- a/camunda-formio-tasklist-vue/package.json
+++ b/camunda-formio-tasklist-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "camunda-formio-tasklist-vue",
-  "version": "1.1.7-rc",
+  "version": "1.1.8-rc",
   "description": "Vue components to integrate formsflow.ai",
   "private": false,
   "main": "./dist/camunda-formio-tasklist-vue.common.js",
diff --git a/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue b/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue
index 73741f5..2181886 100644
--- a/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue
+++ b/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue
@@ -420,12 +420,17 @@ export default class FormListModal extends Mixins(BaseMixin) {
   oncustomEventCallback = (customEvent: CustomEventPayload) => {
     switch (customEvent.type) {
     case "customSubmitDone":
+      this.backToFormList();
       this.$emit("update-task");
       break;
+    case "cancelSubmission":
+      this.backToFormList();
+      break;
     default: 
       break;
     }
   };
+ 
 
 }
 </script>
diff --git a/camunda-formio-tasklist-vue/src/components/layout/RightSider.vue b/camunda-formio-tasklist-vue/src/components/layout/RightSider.vue
index 309e163..b5eb847 100644
--- a/camunda-formio-tasklist-vue/src/components/layout/RightSider.vue
+++ b/camunda-formio-tasklist-vue/src/components/layout/RightSider.vue
@@ -474,7 +474,7 @@
 import {
   CamundaRest,
   SEARCH_USERS_BY,
-  SocketIOService,
+  // SocketIOService,
   getISODateTime,
   reviewerGroup,
 } from "../../services";
@@ -571,9 +571,10 @@ async onSetassignee() {
       this.bpmApiUrl
   );
   await this.toggleassignee();
-  if (!SocketIOService.isConnected()) {
-    this.getBPMTaskandReload();
-  }
+  // if (!SocketIOService.isConnected()) {
+  //   this.getBPMTaskandReload();
+  // }
+  this.getBPMTaskandReload();
 }
 
 // toggle assignee
@@ -668,9 +669,10 @@ async onClaim() {
       this.bpmApiUrl
   );
    
-  if (!SocketIOService.isConnected()) {
-    this.getBPMTaskandReload();
-  }
+  // if (!SocketIOService.isConnected()) {
+  //   this.getBPMTaskandReload();
+  // }
+  this.getBPMTaskandReload();
   this.loadingClaimAndUnclaim= false;
 
 }
@@ -681,9 +683,10 @@ async onUnClaim() {
   this.loadingClaimAndUnclaim= true;
   await CamundaRest.unclaim(this.token, this.task.id!, this.bpmApiUrl);
 
-  if (!SocketIOService.isConnected()) {
-    this.getBPMTaskandReload();
-  }
+  // if (!SocketIOService.isConnected()) {
+  //   this.getBPMTaskandReload();
+  // }
+  this.getBPMTaskandReload();
   this.loadingClaimAndUnclaim= false;
 }
 
@@ -748,9 +751,9 @@ async deleteGroup(groupid: string) {
 // update data
 async updateTaskDatedetails(taskId: string, task: TaskPayload) {
   await CamundaRest.updateTasksByID(this.token, taskId, this.bpmApiUrl, task);
-  if (!SocketIOService.isConnected()) {
-    await this.reloadCurrentTask();
-  }
+  // if (!SocketIOService.isConnected()) {
+  await this.reloadCurrentTask();
+  // }
 }