diff --git a/src/visualBuilder/eventManager/useCollab.ts b/src/visualBuilder/eventManager/useCollab.ts
index 825ecb69..7f05cc2b 100644
--- a/src/visualBuilder/eventManager/useCollab.ts
+++ b/src/visualBuilder/eventManager/useCollab.ts
@@ -43,6 +43,10 @@ export const useCollab = () => {
                     "collab.pauseFeedback",
                     data?.data?.collab?.pauseFeedback
                 );
+                Config.set(
+                    "collab.isFeedbackMode",
+                    data?.data?.collab?.isFeedbackMode
+                );
                 showAllCollabIcons();
                 return;
             }
diff --git a/src/visualBuilder/generators/generateThread.tsx b/src/visualBuilder/generators/generateThread.tsx
index 850cac7e..8f54a506 100644
--- a/src/visualBuilder/generators/generateThread.tsx
+++ b/src/visualBuilder/generators/generateThread.tsx
@@ -376,6 +376,7 @@ export function hideAllCollabIcons(): void {
         ".visual-builder__collab-wrapper .collab-thread"
     );
     icons?.forEach((icon) => icon?.classList.add(hiddenClass));
+    toggleCollabPopup({ threadUid: "", action: "close" });
 }
 
 export function showAllCollabIcons(): void {