diff --git a/src/components/Categories/CategoriesSection/index.tsx b/src/components/Categories/CategoriesSection/index.tsx
index e98b80128..5854653f8 100644
--- a/src/components/Categories/CategoriesSection/index.tsx
+++ b/src/components/Categories/CategoriesSection/index.tsx
@@ -18,7 +18,7 @@ const StyledSection = styled.section`
     padding: 30px 0;
   }
   h2 {
-    margin-bottom: 27px;
+    margin: 27px 0;
   }
   .slider-title {
     @media (max-width: 575px) {
diff --git a/src/components/Consultations/ConsultationCard/EndMeetingQuestionnaires/index.tsx b/src/components/Consultations/ConsultationCard/EndMeetingQuestionnaires/index.tsx
index 4db130815..5dae5b6bf 100644
--- a/src/components/Consultations/ConsultationCard/EndMeetingQuestionnaires/index.tsx
+++ b/src/components/Consultations/ConsultationCard/EndMeetingQuestionnaires/index.tsx
@@ -25,7 +25,6 @@ export const EndMeetingQuestionnairesModal = ({
   const {
     questionnaires: questionnairesList,
     loading,
-    // error,
     getQuestionnaires,
   } = useQuestionnaires({
     entityId: entityId || 0,
@@ -132,7 +131,7 @@ export const EndMeetingQuestionnairesModal = ({
   }, [state, moveToNextQuestionnaire, setIsEnded]);
 
   useEffect(() => {
-    getQuestionnaires();
+    getQuestionnaires(handleClose);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [entityId]);
 
diff --git a/src/components/Consultations/ConsultationCard/JitsyMeeting/index.tsx b/src/components/Consultations/ConsultationCard/JitsyMeeting/index.tsx
index cc707ad4f..5918a2774 100644
--- a/src/components/Consultations/ConsultationCard/JitsyMeeting/index.tsx
+++ b/src/components/Consultations/ConsultationCard/JitsyMeeting/index.tsx
@@ -1,19 +1,23 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import { JaaSMeeting } from "@jitsi/react-sdk";
 import { IJitsiMeetExternalApi } from "@jitsi/react-sdk/lib/types";
-import { Text } from "@escolalms/components/lib/components/atoms/Typography/Text";
-
-import * as API from "@escolalms/sdk/lib/types";
-import useCamera, { cameraPermissions } from "@/hooks/meeting/useCamera";
-import { getCurrentUser } from "@/utils/meeting";
 import JitsyMeetingMessage from "@/components/Consultations/ConsultationCard/JitsyMeeting/Message";
 import { useRoles } from "@/hooks/useRoles";
 import { useTranslation } from "react-i18next";
 import { Modal } from "@escolalms/components/lib/components/atoms/Modal/Modal";
 import styled from "styled-components";
+import JitsyMeetingSkeleton from "@/components/Skeletons/JitsyMeeting";
+import { EscolaLMSContext } from "@escolalms/sdk/lib/react/context";
 import { API_URL } from "@/config/index";
+import useCamera, { cameraPermissions } from "@/hooks/meeting/useCamera";
+import { API } from "@escolalms/sdk/lib";
+import { IMeetRecording } from "@/components/Consultations/ConsultationCard/JitsyMeeting/types";
+import {
+  JITSY_ANALYTICS_INTERVAL,
+  JITSY_TUTOR_INTERVAL,
+} from "@/utils/constants";
+import { Text } from "@escolalms/components/lib/components/atoms/Typography/Text";
 import { Button } from "@escolalms/components/lib/components/atoms/Button/Button";
-import JitsyMeetingSkeleton from "@/components/Skeletons/JitsyMeeting";
 
 export const StyledModal = styled(Modal)`
   .rc-dialog-content {
@@ -39,271 +43,334 @@ const StyledAccessWrapper = styled.div`
   }
 `;
 
-const FRAME_RATE = 1;
-const SEND_INTERVAL = 1000;
-
-declare global {
-  interface Window {
-    api: IJitsiMeetExternalApi;
-  }
-}
-
-type Props = {
+type JitsyMeetingProps = {
   jitsyData: Omit<API.JitsyData, "yt_url" | "yt_stream_url" | "yt_stream_key">;
   term: string;
-  consultationTermId: number;
+  consultationTermId?: number;
   consultationId?: number;
   close?: () => void;
   onRecordingAvailable?: (url: string) => void;
+  modelId: number;
+  modelType: "consultation" | "webinar";
 };
 
-const JitsyMeeting: React.FC<Props> = ({
+const JitsyMeeting: React.FC<JitsyMeetingProps> = ({
   jitsyData,
+  modelId,
+  modelType,
   term,
   consultationTermId,
-  consultationId,
   close,
   onRecordingAvailable,
 }) => {
   const [showMeeting, setShowMeeting] = useState(false);
   const [showModal, setShowModal] = useState(false);
-  const { camera, getDataUrl, hasCameraAccess, cameraAccessStatus } =
-    useCamera();
+  const { token } = useContext(EscolaLMSContext);
+  const { isStudent } = useRoles();
+  const { t } = useTranslation();
+
+  const { camera, getDataUrl, cameraAccessStatus } = useCamera();
   const userConsentedRef = useRef(false);
-  const isMeetingActive = useRef(false);
-  const intervalIdRef = useRef<NodeJS.Timeout | null>(null);
-  const workerRef = useRef<Worker | null>(null);
   const isCameraMutedRef = useRef(false);
 
-  const { isStudent } = useRoles();
-  const { t } = useTranslation();
+  const recordingIdRef = useRef<number | null>(null);
+  const recordingUrlRef = useRef<string | null>(null);
+  const recordingExpiryRef = useRef<number | null>(null);
 
-  const handleConferenceJoined = useCallback(() => {
-    isMeetingActive.current = true;
-  }, []);
+  const analyticsIntervalRef = useRef<NodeJS.Timeout | null>(null);
+  const recommenderIntervalRef = useRef<NodeJS.Timeout | null>(null);
+  const workerRef = useRef<Worker | null>(null);
+  const apiRef = useRef<IJitsiMeetExternalApi | null>(null);
+  const recordingTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
-  const handleConferenceLeft = useCallback(() => {
-    isMeetingActive.current = false;
-  }, []);
+  const preparePayload = useCallback(
+    (action: "start-recording" | "end-recording") => {
+      const now = new Date().toISOString();
+      const payload: IMeetRecording = {
+        id: recordingIdRef.current || 0,
+        model_type: modelType,
+        model_id: Number(modelId),
+        action,
+        term: term || now,
+      };
 
-  interface RecordingLinkAvailableEvent {
-    link: string;
-  }
+      if (action === "start-recording") {
+        payload.start_at = now;
+      } else {
+        payload.end_at = now;
+        if (recordingUrlRef.current) {
+          payload.url = recordingUrlRef.current;
+        }
 
-  const handleRecordingLinkAvailable = useCallback(
-    (event: RecordingLinkAvailableEvent) => {
-      if (event.link && onRecordingAvailable) {
-        onRecordingAvailable(event.link);
+        if (recordingExpiryRef.current) {
+          payload.url_expiration_time_millis = recordingExpiryRef.current;
+        }
       }
+
+      return payload;
     },
-    [onRecordingAvailable]
+    [modelId, modelType, term]
   );
 
-  const saveImagesInWorker = useCallback(
-    (
-      consultationId: number,
-      consultationTermId: number,
-      userEmail: string,
-      userId: number,
-      screenshots: { dataURL: Blob; timestamp: number }[],
-      term: string
-    ) => {
-      if (!workerRef.current) {
-        workerRef.current = new Worker(
-          new URL("../../../../workers/saveImageWorker.ts", import.meta.url),
-          { type: "module" }
+  const sendRecordingEvent = useCallback(
+    async (action: "start-recording" | "end-recording") => {
+      if (isStudent) return;
+      try {
+        const payload = preparePayload(action);
+
+        const response = await fetch(
+          `${API_URL}/api/recommender/meet-recordings`,
+          {
+            method: "POST",
+            keepalive: true,
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify(payload),
+          }
         );
-        workerRef.current.postMessage({
-          apiUrl: API_URL,
-        });
-      }
 
-      workerRef.current.onmessage = (event: MessageEvent) => {
-        const { success, error } = event.data;
-        if (success) {
-          console.log("Images saved successfully via Worker.");
-        } else {
-          console.error("Error saving images in Worker:", error);
-        }
-      };
+        const result = await response.json();
 
-      workerRef.current.postMessage({
-        consultationId,
-        consultationTermId,
-        userEmail,
-        userId,
-        screenshots,
-        term,
-      });
+        if (action === "start-recording" && result?.data?.id) {
+          recordingIdRef.current = result.data.id;
+        }
+      } catch (e) {
+        console.error("Recording API error", e);
+      }
     },
-    []
+    [isStudent, token, preparePayload]
   );
 
-  const handleRecordingStatusChanged = useCallback(
-    async (
-      api: IJitsiMeetExternalApi,
-      getDataUrl: () => Promise<Blob | null>,
-      status: {
-        on: boolean;
-        mode: string;
-        error?: string;
-        transcription: boolean;
-      }
-    ) => {
-      if (status.on) {
-        let screenshots: {
-          dataURL: Blob;
-          timestamp: number;
-          userID: number;
-          consultationId: number | undefined;
-        }[] = [];
-
-        if (!intervalIdRef.current) {
-          intervalIdRef.current = setInterval(async () => {
-            if (isCameraMutedRef.current) {
-              return;
-            }
+  const stopAllIntervals = useCallback(() => {
+    if (analyticsIntervalRef.current) {
+      clearInterval(analyticsIntervalRef.current);
+      analyticsIntervalRef.current = null;
+    }
+    if (recommenderIntervalRef.current) {
+      clearInterval(recommenderIntervalRef.current);
+      recommenderIntervalRef.current = null;
+    }
 
-            const dataUrl = await getDataUrl();
-            if (dataUrl) {
-              screenshots.push({
-                dataURL: dataUrl,
-                timestamp: new Date().getTime(),
-                userID: jitsyData.data.userInfo.id,
-                consultationId,
-              });
-
-              if (screenshots.length === FRAME_RATE * (SEND_INTERVAL / 1000)) {
-                const currentUser = await getCurrentUser(api);
-                if (currentUser) {
-                  saveImagesInWorker(
-                    consultationId ?? 0,
-                    consultationTermId,
-                    jitsyData.data.userInfo.email,
-                    jitsyData.data.userInfo.id,
-                    screenshots,
-                    term
-                  );
-                  screenshots = [];
-                }
-              }
-            }
-          }, 1000 / FRAME_RATE);
+    if (recordingTimeoutRef.current) {
+      clearTimeout(recordingTimeoutRef.current);
+      recordingTimeoutRef.current = null;
+    }
+  }, []);
+
+  const startScreenshotFlows = useCallback(() => {
+    if (!workerRef.current) {
+      workerRef.current = new Worker(
+        new URL("../../../../workers/saveImageWorker.ts", import.meta.url),
+        { type: "module" }
+      );
+      workerRef.current.postMessage({ apiUrl: API_URL });
+    }
+
+    const userId = jitsyData.data.userInfo.id;
+    const userEmail = jitsyData.data.userInfo.email;
+
+    if (isStudent && !analyticsIntervalRef.current) {
+      analyticsIntervalRef.current = setInterval(async () => {
+        if (isCameraMutedRef.current || !userConsentedRef.current) return;
+
+        const blob = await getDataUrl();
+        if (blob) {
+          const screenshotPayload = {
+            dataURL: blob,
+            timestamp: Date.now(),
+            userID: userId,
+          };
+
+          workerRef.current?.postMessage({
+            modelId: Number(modelId),
+            modelType,
+            userId,
+            userEmail,
+            consultationTermId,
+            screenshots: [screenshotPayload],
+            term,
+            token,
+          });
         }
-      } else {
-        if (intervalIdRef.current) {
-          clearInterval(intervalIdRef.current);
-          intervalIdRef.current = null;
+      }, JITSY_ANALYTICS_INTERVAL);
+    }
+
+    if (!isStudent && !recommenderIntervalRef.current) {
+      recommenderIntervalRef.current = setInterval(async () => {
+        if (isCameraMutedRef.current) return;
+
+        const blob = await getDataUrl();
+        if (blob) {
+          workerRef.current?.postMessage({
+            action: "recommender-screens",
+            modelId: Number(modelId),
+            modelType,
+            userId,
+            term: term || new Date().toISOString(),
+            screenshots: [
+              {
+                dataURL: blob,
+                timestamp: Date.now(),
+                userID: userId,
+              },
+            ],
+            token,
+          });
         }
-      }
-    },
-    [
-      consultationId,
-      consultationTermId,
-      jitsyData.data.userInfo.email,
-      jitsyData.data.userInfo.id,
-      term,
-      saveImagesInWorker,
-    ]
-  );
+      }, JITSY_TUTOR_INTERVAL);
+    }
+  }, [
+    isStudent,
+    modelId,
+    modelType,
+    term,
+    token,
+    jitsyData,
+    getDataUrl,
+    consultationTermId,
+  ]);
 
   const onApiReady = useCallback(
     async (api: IJitsiMeetExternalApi) => {
-      window.api = api;
+      apiRef.current = api;
       await camera();
-      api.isVideoMuted().then((muted) => {
-        isCameraMutedRef.current = muted;
-      });
-
-      api.addListener("videoConferenceJoined", () => handleConferenceJoined());
-      api.addListener("videoConferenceLeft", () => handleConferenceLeft());
 
-      api.addListener("recordingLinkAvailable", (event) =>
-        handleRecordingLinkAvailable(event)
+      api.on(
+        "recordingLinkAvailable",
+        (event: { link: string; ttl: number }) => {
+          recordingUrlRef.current = event.link;
+          if (onRecordingAvailable) {
+            onRecordingAvailable(event.link);
+          }
+          if (event.ttl) {
+            recordingExpiryRef.current = event.ttl * 1000;
+          }
+        }
       );
-      api.on("recordingStatusChanged", (status) => {
-        if (userConsentedRef.current)
-          handleRecordingStatusChanged(
-            api,
-            async () => (await getDataUrl()) as Blob,
-            status
-          );
+
+      api.on("recordingStatusChanged", async (status: { on: boolean }) => {
+        if (status.on) {
+          recordingUrlRef.current = null;
+          recordingExpiryRef.current = null;
+          startScreenshotFlows();
+          await sendRecordingEvent("start-recording");
+        } else {
+          stopAllIntervals();
+          if (recordingTimeoutRef.current)
+            clearTimeout(recordingTimeoutRef.current);
+
+          recordingTimeoutRef.current = setTimeout(async () => {
+            if (recordingIdRef.current) {
+              await sendRecordingEvent("end-recording");
+              recordingIdRef.current = null;
+              recordingUrlRef.current = null;
+            }
+            recordingTimeoutRef.current = null;
+          }, 500);
+        }
       });
 
-      api.addListener("videoMuteStatusChanged", (event: { muted: boolean }) => {
-        isCameraMutedRef.current = event.muted;
+      api.on("videoMuteStatusChanged", (e: { muted: boolean }) => {
+        isCameraMutedRef.current = e.muted;
+      });
+
+      api.on("videoConferenceLeft", () => {
+        stopAllIntervals();
+        if (!isStudent && recordingIdRef.current) {
+          sendRecordingEvent("end-recording");
+        }
       });
     },
     [
       camera,
-      handleConferenceJoined,
-      handleConferenceLeft,
-      getDataUrl,
-      handleRecordingStatusChanged,
-      userConsentedRef,
-      handleRecordingLinkAvailable,
+      isStudent,
+      onRecordingAvailable,
+      sendRecordingEvent,
+      startScreenshotFlows,
+      stopAllIntervals,
     ]
   );
 
-  const handleReadyToClose = () => {
-    if (close) {
-      close();
-    }
-    window.api?.dispose();
-    window.location.reload();
-  };
-
-  const getProperRoomName = useCallback(() => {
-    const regex = /\/([^/?]+)\?/;
-    const match = jitsyData.url.match(regex);
-    return match ? match[1] : jitsyData.data.roomName;
-  }, [jitsyData]);
-
   useEffect(() => {
     return () => {
+      stopAllIntervals();
+
+      if (!isStudent && recordingIdRef.current) {
+        sendRecordingEvent("end-recording");
+      }
+
       if (workerRef.current) {
         workerRef.current.terminate();
+        workerRef.current = null;
       }
-      if (intervalIdRef.current) {
-        clearInterval(intervalIdRef.current);
+
+      if (apiRef.current) {
+        apiRef.current.dispose();
+        apiRef.current = null;
       }
     };
-  }, []);
+  }, [stopAllIntervals, isStudent, sendRecordingEvent]);
 
   useEffect(() => {
-    const checkPermissions = async () => {
+    const handleUnload = () => {
+      if (!isStudent && recordingIdRef.current && token) {
+        const payload = preparePayload("end-recording");
+
+        fetch(`${API_URL}/api/recommender/meet-recordings`, {
+          method: "POST",
+          keepalive: true,
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`,
+          },
+          body: JSON.stringify(payload),
+        });
+      }
+    };
+
+    window.addEventListener("beforeunload", handleUnload);
+    return () => window.removeEventListener("beforeunload", handleUnload);
+  }, [isStudent, preparePayload, token]);
+
+  useEffect(() => {
+    const init = async () => {
       try {
         await navigator.mediaDevices.getUserMedia({ video: true, audio: true });
-        if (hasCameraAccess && isMeetingActive && isStudent) {
-          setShowModal(true);
-        } else {
-          setShowModal(false);
-          if (!isStudent) {
-            setShowMeeting(true);
-          }
-        }
-      } catch (error) {
-        console.error("Error checking permissions:", error);
-        setShowModal(false);
+        isStudent ? setShowModal(true) : setShowMeeting(true);
+      } catch {
+        setShowMeeting(true);
       }
     };
+    init();
+  }, [isStudent]);
 
-    checkPermissions();
-  }, [hasCameraAccess, isMeetingActive, isStudent, t]);
+  const getProperRoomName = () => {
+    const regex = /\/([^/?]+)\?/;
+    const match = jitsyData.url.match(regex);
+    return match ? match[1] : jitsyData.data.roomName;
+  };
 
   return (
     <>
-      {jitsyData && !showModal && showMeeting && (
+      {showMeeting && (
         <JaaSMeeting
           jwt={jitsyData.data.jwt}
           appId={jitsyData.data.app_id}
           roomName={getProperRoomName()}
+          onApiReady={onApiReady}
           getIFrameRef={(iframeRef) => {
             iframeRef.style.height = "calc(100vh - 76px)";
             iframeRef.style.width = "100%";
           }}
-          onApiReady={onApiReady}
-          onReadyToClose={handleReadyToClose}
+          onReadyToClose={async () => {
+            stopAllIntervals();
+            if (!isStudent && recordingIdRef.current) {
+              await sendRecordingEvent("end-recording");
+            }
+            close?.();
+          }}
           interfaceConfigOverwrite={{
             ...jitsyData.data.interfaceConfigOverwrite,
           }}
@@ -324,14 +391,14 @@ const JitsyMeeting: React.FC<Props> = ({
         />
       )}
       <StyledModal
-        onClose={() => [setShowModal(false), setShowMeeting(true)]}
         visible={showModal}
-        animation="zoom"
-        maskAnimation="fade"
-        destroyOnClose={true}
-        width={468}
+        onClose={() => [setShowModal(false), setShowMeeting(true)]}
         closable={false}
         maskClosable={false}
+        destroyOnClose={true}
+        width={468}
+        animation="zoom"
+        maskAnimation="fade"
       >
         <JitsyMeetingMessage
           message={t("ConsultationPage.AdditionalRecording")}
@@ -339,7 +406,7 @@ const JitsyMeeting: React.FC<Props> = ({
           userConsentedRef={userConsentedRef}
         />
       </StyledModal>
-      {!showModal && !showMeeting && <JitsyMeetingSkeleton />}
+      {!showMeeting && !showModal && <JitsyMeetingSkeleton />}
       {!showModal &&
         !showMeeting &&
         cameraAccessStatus === cameraPermissions.DENIED && (
diff --git a/src/components/Consultations/ConsultationCard/JitsyMeeting/types.ts b/src/components/Consultations/ConsultationCard/JitsyMeeting/types.ts
new file mode 100644
index 000000000..f3e7cdafe
--- /dev/null
+++ b/src/components/Consultations/ConsultationCard/JitsyMeeting/types.ts
@@ -0,0 +1,17 @@
+export interface IMeetRecording {
+  id: number;
+  model_type: string;
+  action: "start-recording" | "end-recording";
+  model_id: number;
+  term: string | number;
+  start_at?: string;
+  end_at?: string;
+  url?: string;
+  url_expiration_time_millis?: number;
+}
+
+export interface IScreenshot {
+  dataURL: Blob;
+  timestamp: number;
+  userID: number;
+}
diff --git a/src/components/Consultations/ConsultationCard/MeetModal/index.tsx b/src/components/Consultations/ConsultationCard/MeetModal/index.tsx
index 90a0df50a..212887e14 100644
--- a/src/components/Consultations/ConsultationCard/MeetModal/index.tsx
+++ b/src/components/Consultations/ConsultationCard/MeetModal/index.tsx
@@ -47,6 +47,10 @@ const ConsultationMeetModal = ({ onClose }: Props) => {
     };
 
     getMeetUrl();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [consultationModalContext?.consultationData]);
+
+  useEffect(() => {
     return () => {
       Object.keys(localStorage).forEach((key) => {
         if (key.startsWith("questionnaire_")) {
@@ -54,8 +58,7 @@ const ConsultationMeetModal = ({ onClose }: Props) => {
         }
       });
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [consultationModalContext?.consultationData]);
+  }, []);
 
   useEffect(() => {
     setIsEnded(false);
@@ -65,7 +68,6 @@ const ConsultationMeetModal = ({ onClose }: Props) => {
     setIsEnded(true);
     consultationModalContext?.setModalOpen?.(false);
     onClose();
-    window.location.reload();
   }, [setIsEnded, onClose, consultationModalContext]);
 
   return (
@@ -91,16 +93,19 @@ const ConsultationMeetModal = ({ onClose }: Props) => {
             />
             {!loading && meetData && (
               <JitsyMeeting
+                key={consultationModalContext?.consultationData?.consultationId}
                 jitsyData={meetData}
-                close={handleOnClose}
-                consultationId={
-                  consultationModalContext?.consultationData?.consultationId
+                modelId={
+                  consultationModalContext?.consultationData?.consultationId ??
+                  0
                 }
+                modelType="consultation"
                 consultationTermId={
                   consultationModalContext?.consultationData
                     ?.consultationTermId ?? 0
                 }
                 term={consultationModalContext?.consultationData?.term ?? ""}
+                close={handleOnClose}
                 onRecordingAvailable={setRecordingUrl}
               />
             )}
diff --git a/src/components/Courses/RateCourse/index.tsx b/src/components/Courses/RateCourse/index.tsx
index 1acd86b5c..da712b9c7 100644
--- a/src/components/Courses/RateCourse/index.tsx
+++ b/src/components/Courses/RateCourse/index.tsx
@@ -55,7 +55,7 @@ const RateCourse: React.FC<Props> = ({
           if (request.success) {
             toast(`${t("RateCourse.AnswerSended")}`, "success");
           }
-          // @ts-ignore
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
         } catch (error: any) {
           toast("Error", error.message);
           console.error(error);
diff --git a/src/components/MeetingAnalyticsOverlay/MeetingAnalyticsOverlay.tsx b/src/components/MeetingAnalyticsOverlay/MeetingAnalyticsOverlay.tsx
index f8c691f41..cb0bf068c 100644
--- a/src/components/MeetingAnalyticsOverlay/MeetingAnalyticsOverlay.tsx
+++ b/src/components/MeetingAnalyticsOverlay/MeetingAnalyticsOverlay.tsx
@@ -21,6 +21,7 @@ import { ConsultationModalContext } from "@/components/Consultations/Consultatio
 import { useRoles } from "@/hooks/useRoles";
 import { DataPoint, EMOTION_POOL, EmotionHistory } from "@/types/sockets";
 import { useTranslation } from "react-i18next";
+import { API } from "@escolalms/sdk/lib";
 
 const getColorByValue = (val: number) => {
   if (val < 35) return "#FF4D4D";
@@ -30,10 +31,14 @@ const getColorByValue = (val: number) => {
 
 export default function MeetingAnalyticsOverlay({
   onClose,
+  modelType = "consultation",
   recordingUrl,
+  webinar,
 }: {
   onClose: () => void;
+  modelType?: "consultation" | "webinar";
   recordingUrl?: string | null;
+  webinar?: API.Webinar;
 }) {
   const { isTutor } = useRoles();
   const { consultation, token } = useContext(EscolaLMSContext);
@@ -42,22 +47,27 @@ export default function MeetingAnalyticsOverlay({
   const [hoveredPanel, setHoveredPanel] = useState<
     "emotion" | "attention" | null
   >(null);
+  const modelId = useMemo(() => {
+    if (modelType === "webinar") return webinar?.id;
+    return consultationModalContext?.consultationData?.consultationId;
+  }, [modelType, webinar, consultationModalContext]);
 
-  const scrollRef = useRef<HTMLDivElement>(null);
+  const unixTimestamp = useMemo(() => {
+    const rawDate =
+      modelType === "webinar"
+        ? webinar?.active_to
+        : consultationModalContext?.consultationData?.term;
+
+    return rawDate ? Math.floor(new Date(rawDate).getTime() / 1000) : undefined;
+  }, [modelType, webinar, consultationModalContext]);
 
-  const unixTimestamp = consultationModalContext?.consultationData?.term
-    ? Math.floor(
-        new Date(consultationModalContext?.consultationData?.term).getTime() /
-          1000
-      )
-    : undefined;
+  const scrollRef = useRef<HTMLDivElement>(null);
 
   const { socketData } = useMeetingSockets(
-    isTutor
-      ? consultationModalContext?.consultationData?.consultationId
-      : undefined,
+    isTutor ? modelId : undefined,
     isTutor ? unixTimestamp : undefined,
-    isTutor ? token : undefined
+    isTutor ? token : undefined,
+    modelType
   );
 
   const [attentionData, setAttentionData] = useState<DataPoint[]>([]);
@@ -78,6 +88,17 @@ export default function MeetingAnalyticsOverlay({
     [t]
   );
 
+  const displayTitle = useMemo(() => {
+    if (modelType === "webinar") {
+      return webinar?.name || "";
+    }
+    return (
+      consultation?.value?.name ??
+      consultationModalContext?.consultationData?.name ??
+      ""
+    );
+  }, [modelType, webinar, consultation, consultationModalContext]);
+
   useEffect(() => {
     if (scrollRef.current) {
       scrollRef.current.scrollTo({
@@ -189,11 +210,7 @@ export default function MeetingAnalyticsOverlay({
           <BackButton onClick={onClose}>
             <Chevron>‹</Chevron>
           </BackButton>
-          <HeaderTitle>
-            {consultation?.value?.name ??
-              consultationModalContext?.consultationData?.name ??
-              ""}
-          </HeaderTitle>
+          <HeaderTitle>{displayTitle}</HeaderTitle>
         </LeftGroup>
 
         {isTutor && (
@@ -522,39 +539,59 @@ const StatCard = styled.div<{ active: boolean; glowColor?: string }>`
   padding: 10px 20px;
   cursor: pointer;
   position: relative;
-  border-radius: 8px;
-  transition: all 0.2s ease;
-  background: ${({ active, glowColor }) =>
-    active
-      ? `linear-gradient(#1A1A1A, #1A1A1A) padding-box, linear-gradient(to bottom, ${glowColor} 0%, transparent 60%) border-box`
-      : `linear-gradient(#0D0D0D, #0D0D0D) padding-box, linear-gradient(to bottom, #333, #333) border-box`};
-  border: 1px solid transparent;
+  border-radius: 12px;
+  transition: all 0.3s ease;
+  background: ${({ active }) => (active ? "#1A1A1A" : "#0D0D0D")};
+  border: 1px solid ${({ active }) => (active ? "transparent" : "#222")};
+  overflow: hidden;
 
   &::before {
     content: "";
     position: absolute;
     top: -1px;
-    left: 10%;
-    right: 10%;
-    height: 1px;
+    left: -1px;
+    right: -1px;
+    bottom: -1px;
+    border-radius: 12px;
+    padding: 1.5px;
     background: ${({ active, glowColor }) =>
-      active ? glowColor : "transparent"};
-    box-shadow: ${({ active, glowColor }) =>
-      active ? `0 0 10px ${glowColor}` : "none"};
-    opacity: ${({ active }) => (active ? 0.8 : 0)};
-    transition: opacity 0.2s ease;
+      active
+        ? `linear-gradient(to bottom, ${glowColor}, transparent 65%)`
+        : "transparent"};
+
+    mask: linear-gradient(#fff, #fff) content-box, linear-gradient(#fff, #fff);
+    mask-composite: exclude;
+    -webkit-mask: linear-gradient(#fff, #fff) content-box,
+      linear-gradient(#fff, #fff);
+    -webkit-mask-composite: destination-out;
+    opacity: ${({ active }) => (active ? 1 : 0)};
+    transition: opacity 0.3s ease;
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 100%;
+    background: ${({ active, glowColor }) =>
+      active
+        ? `radial-gradient(circle at 50% 0%, ${glowColor}25 0%, transparent 60%)`
+        : "transparent"};
+    opacity: ${({ active }) => (active ? 1 : 0)};
     pointer-events: none;
+    transition: opacity 0.3s ease;
   }
 
   &:hover {
-    background: #141414;
+    background: ${({ active }) => (active ? "#1A1A1A" : "#141414")};
   }
 
-  @media (max-width: 768px) {
-    padding: 8px 12px;
-    gap: 8px;
-    flex: 1;
-    justify-content: center;
+  & > * {
+    position: relative;
+    z-index: 2;
   }
 `;
 
diff --git a/src/components/Profile/ProfileHeader/index.tsx b/src/components/Profile/ProfileHeader/index.tsx
index 972f54195..bf1138668 100644
--- a/src/components/Profile/ProfileHeader/index.tsx
+++ b/src/components/Profile/ProfileHeader/index.tsx
@@ -29,7 +29,9 @@ const StyledHeader = styled.div<{ withTabs?: boolean }>`
 const ProfileHeader: React.FC<Props> = ({ title, withTabs, actions }) => {
   return (
     <StyledHeader withTabs={withTabs}>
-      <Title level={2}>{title}</Title>
+      <Title level={2} style={{ marginBottom: 12 }}>
+        {title}
+      </Title>
       {actions && <div className="actions">{actions}</div>}
     </StyledHeader>
   );
diff --git a/src/components/Profile/ProfileLayout/index.tsx b/src/components/Profile/ProfileLayout/index.tsx
index 7aafa4be5..24f3ff912 100644
--- a/src/components/Profile/ProfileLayout/index.tsx
+++ b/src/components/Profile/ProfileLayout/index.tsx
@@ -87,6 +87,11 @@ const ProfileLayout: React.FC<Props> = ({
         title: t("MyProfilePage.MyConsultations"),
         url: routeRoutes.myConsultations,
       },
+      {
+        key: "WEBINARS",
+        title: t("MyProfilePage.MyWebinars"),
+        url: routeRoutes.myWebinars,
+      },
     ],
     [t]
   );
diff --git a/src/components/Profile/ProfileWebinars/index.tsx b/src/components/Profile/ProfileWebinars/index.tsx
index 8450f9008..59c984968 100644
--- a/src/components/Profile/ProfileWebinars/index.tsx
+++ b/src/components/Profile/ProfileWebinars/index.tsx
@@ -1,4 +1,4 @@
-import { memo, useState } from "react";
+import { memo, useContext, useState, useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { Col, Row } from "react-grid-system";
 import ContentLoader from "@/components/_App/ContentLoader";
@@ -10,6 +10,7 @@ import { API } from "@escolalms/sdk/lib";
 import { ProfileWebinarItemFooter } from "./ItemFooter";
 import { ProfileWebinarItemActions } from "./ItemActions";
 import WebinarMeetModal from "@/components/Webinars/Webinar/WebinarMeetModal";
+import { WebinarsContext } from "@/components/Webinars/List/WebinarsContext";
 
 const RowStyled = styled(Row)`
   gap: 30px 0;
@@ -29,8 +30,17 @@ ProfileWebinarsProps) => {
   const [webinarJoinId, setWebinarJoinId] = useState<number | undefined>(
     undefined
   );
+  const [webinarData, setWebinarData] = useState<API.Webinar | undefined>(
+    undefined
+  );
+
+  const webinarsContext = useContext(WebinarsContext);
   const { t } = useTranslation();
 
+  const handleOnCloseModal = useCallback(() => {
+    setWebinarJoinId(undefined);
+  }, []);
+
   if (loading) {
     return <ContentLoader />;
   }
@@ -54,19 +64,23 @@ ProfileWebinarsProps) => {
             actions={
               <ProfileWebinarItemActions
                 webinar={webinar}
-                onJoin={() => setWebinarJoinId(webinar.id)}
+                onJoin={() => {
+                  setWebinarData(webinar);
+                  setWebinarJoinId(webinar.id);
+                  webinarsContext?.setModalOpen?.(true);
+                }}
               />
             }
             footer={<ProfileWebinarItemFooter webinar={webinar} />}
           />
         </Col>
       ))}
-      {/* MEET MODAL */}
       {!!webinarJoinId && (
         <WebinarMeetModal
           visible={!!webinarJoinId}
-          onClose={() => setWebinarJoinId(undefined)}
+          onClose={handleOnCloseModal}
           webinarId={webinarJoinId}
+          webinar={webinarData}
         />
       )}
     </RowStyled>
diff --git a/src/components/Routes/index.tsx b/src/components/Routes/index.tsx
index 1cdb67be8..7983d358a 100644
--- a/src/components/Routes/index.tsx
+++ b/src/components/Routes/index.tsx
@@ -35,8 +35,8 @@ const ConsultationsPage = lazy(() => import("../../pages/consultations"));
 const ResetPage = lazy(() => import("../../pages/reset-password/index"));
 // const EventsPage = lazy(() => import("../../pages/events"));
 // const EventPage = lazy(() => import("../../pages/event"));
-// const WebinarsPage = lazy(() => import("../../pages/webinars"));
-// const WebinarPage = lazy(() => import("../../pages/webinar"));
+const WebinarsPage = lazy(() => import("../../pages/webinars"));
+const WebinarPage = lazy(() => import("../../pages/webinar"));
 // const PackagesPage = lazy(() => import("../../pages/packages"));
 const PackagePage = lazy(() => import("../../pages/package"));
 const SubscriptionsPage = lazy(() => import("../../pages/subscriptions"));
@@ -62,7 +62,7 @@ const MyConsultationsPage = lazy(
 const MyDataPage = lazy(() => import("../../pages/user/my-data"));
 const CourseProgramPage = lazy(() => import("../../pages/course/index"));
 const CartPage = lazy(() => import("../../pages/cart/index"));
-// const MyWebinarsPage = lazy(() => import("../../pages/user/MyWebinars"));
+const MyWebinarsPage = lazy(() => import("../../pages/user/MyWebinars"));
 const MyCertificatesPage = lazy(
   () => import("../../pages/user/my-certificates")
 );
@@ -116,9 +116,9 @@ const Routes: React.FC = (): ReactElement => {
     // myStationaryEvents,
     // myTasks,
     // myBookmarks,
-    // webinars,
-    // webinar,
-    // myWebinars,
+    webinars,
+    webinar,
+    myWebinars,
     // packages,
     packageProduct,
     myCertificates,
@@ -154,9 +154,9 @@ const Routes: React.FC = (): ReactElement => {
           <ConfigRoute exact path={preview} component={CoursePreviewPage} />
           <ConfigRouteExtend exact path={courses} component={CoursesPage} />
           {/* <ConfigRoute exact path={events} component={EventsPage} />
-          <ConfigRoute exact path={event} component={EventPage} />
+          <ConfigRoute exact path={event} component={EventPage} />*/}
           <ConfigRoute exact path={webinars} component={WebinarsPage} />
-          <ConfigRoute exact path={webinar} component={WebinarPage} /> */}
+          <ConfigRoute exact path={webinar} component={WebinarPage} />
           {/* <ConfigRoute exact path={packages} component={PackagesPage} /> */}
           <ConfigRoute exact path={packageProduct} component={PackagePage} />
           {/* privates pages*/}
@@ -164,7 +164,7 @@ const Routes: React.FC = (): ReactElement => {
           <PrivateRoute exact path={myProfile} component={MyProfilePage} />
           {/* <PrivateRoute exact path={myTasks} component={MyTasks} />
           <PrivateRoute exact path={myBookmarks} component={MyBookmarks} /> */}
-          {/* <PrivateRoute exact path={myWebinars} component={MyWebinarsPage} /> */}
+          <PrivateRoute exact path={myWebinars} component={MyWebinarsPage} />
           <PrivateRoute
             exact
             path={mySubscriptions}
diff --git a/src/components/Webinars/List/WebinarsContext.tsx b/src/components/Webinars/List/WebinarsContext.tsx
index 00f7a644c..5fec904dd 100644
--- a/src/components/Webinars/List/WebinarsContext.tsx
+++ b/src/components/Webinars/List/WebinarsContext.tsx
@@ -13,4 +13,8 @@ export const WebinarsContext: React.Context<{
   params?: WebinarsParams;
   setParams?: (params: WebinarsParams) => void;
   onlyFree?: boolean;
+  webinarData?: API.Webinar | null;
+  setWebinarData?: (webinar: API.Webinar | null) => void;
+  isModalOpen?: boolean;
+  setModalOpen?: (open: boolean) => void;
 }> = React.createContext({});
diff --git a/src/components/Webinars/List/WebinarsProvider.tsx b/src/components/Webinars/List/WebinarsProvider.tsx
index a32542263..bb2dacea6 100644
--- a/src/components/Webinars/List/WebinarsProvider.tsx
+++ b/src/components/Webinars/List/WebinarsProvider.tsx
@@ -20,17 +20,16 @@ const WebinarsProvider: React.FC<{
   const { fetchWebinars, webinars, fetchTags } = useContext(EscolaLMSContext);
   const location = useLocation();
   const { push } = useHistory();
-
   const [params, setParams] = useState<WebinarsParams | undefined>();
+  const [webinarData, setWebinarData] = useState<API.Webinar | null>(null);
+  const [isModalOpen, setModalOpen] = useState(false);
 
   const getApiParams = (params: WebinarsParams = {}): WebinarsParams => {
-    const apiParams = {
+    return {
       page: 1,
       per_page: 8,
-      // order_by: 'created_at',
       ...params,
     };
-    return apiParams;
   };
 
   useEffect(() => {
@@ -53,11 +52,20 @@ const WebinarsProvider: React.FC<{
     } else {
       fetchWebinars(getApiParams(params));
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [location.search]);
+  }, [fetchWebinars, location.search, params]);
 
   return (
-    <WebinarsContext.Provider value={{ params, setParams, webinars: webinars }}>
+    <WebinarsContext.Provider
+      value={{
+        params,
+        setParams,
+        webinars: webinars,
+        webinarData,
+        setWebinarData,
+        isModalOpen,
+        setModalOpen,
+      }}
+    >
       {children}
     </WebinarsContext.Provider>
   );
diff --git a/src/components/Webinars/Webinar/WebinarMeetModal/index.tsx b/src/components/Webinars/Webinar/WebinarMeetModal/index.tsx
index 858dc7107..1f29c93f1 100644
--- a/src/components/Webinars/Webinar/WebinarMeetModal/index.tsx
+++ b/src/components/Webinars/Webinar/WebinarMeetModal/index.tsx
@@ -1,4 +1,4 @@
-import { useContext, useEffect, useState } from "react";
+import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import { EscolaLMSContext } from "@escolalms/sdk/lib/react";
 import { Modal } from "@escolalms/components/lib/components/atoms/Modal/Modal";
 import { JitsyData } from "@escolalms/sdk/lib/types";
@@ -6,64 +6,138 @@ import ContentLoader from "@/components/_App/ContentLoader";
 import { WebinarMeetModalStyles } from "./WebinarMeetModalStyles";
 import { useTranslation } from "react-i18next";
 import { toast } from "@/utils/toast";
+import styled from "styled-components";
+import JitsyMeeting from "@/components/Consultations/ConsultationCard/JitsyMeeting";
+import MeetingAnalyticsOverlay from "@/components/MeetingAnalyticsOverlay/MeetingAnalyticsOverlay";
+import { EndMeetingQuestionnairesModal } from "@/components/Consultations/ConsultationCard/EndMeetingQuestionnaires";
+import { QuestionnaireModelType } from "@/types/questionnaire";
+import { API } from "@escolalms/sdk/lib";
+import { useRoles } from "@/hooks/useRoles";
 
 interface Props {
   onClose: () => void;
   visible: boolean;
   webinarId: number;
+  webinar?: API.Webinar;
 }
 
-const WebinarMeetModal = ({ onClose, visible, webinarId }: Props) => {
+const JitsiContainer = styled.div`
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+`;
+
+const WebinarMeetModal = ({ onClose, visible, webinarId, webinar }: Props) => {
   const [webinarMeetData, setWebinarMeetData] = useState<JitsyData | null>(
     null
   );
   const [loading, setLoading] = useState(false);
+  const [isEnded, setIsEnded] = useState(false);
+  const [recordingUrl, setRecordingUrl] = useState<string | null>(null);
+  const onCloseRef = useRef(onClose);
   const { generateWebinarJitsy } = useContext(EscolaLMSContext);
   const { t } = useTranslation();
+  const { isTutor } = useRoles();
+
+  useEffect(() => {
+    onCloseRef.current = onClose;
+  }, [onClose]);
 
   useEffect(() => {
     const getMeetUrl = async () => {
+      if (!webinarId || !visible || webinarMeetData) return;
+
       setLoading(true);
-      if (webinarId) {
+      try {
         const res = await generateWebinarJitsy(webinarId);
         if (res.success) {
           setWebinarMeetData((res as { data: JitsyData }).data);
+        } else {
+          toast(t("WebinarPage.ErrorWhileGeneratingUrl"), "error");
+          onCloseRef.current();
         }
-        if (!res.success) {
-          toast(`${t("WebinarPage.ErrorWhileGeneratingUrl")}`, "error");
-          onClose();
-        }
+      } catch (error) {
+        console.error("Error generating Jitsi URL:", error);
+        toast(t("WebinarPage.ErrorWhileGeneratingUrl"), "error");
+      } finally {
+        setLoading(false);
       }
-      setLoading(false);
     };
-
     getMeetUrl();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [webinarId]);
+  }, [webinarId, visible, generateWebinarJitsy, t, webinarMeetData]);
+
+  useEffect(() => {
+    return () => {
+      Object.keys(localStorage).forEach((key) => {
+        if (key.startsWith("questionnaire_")) {
+          localStorage.removeItem(key);
+        }
+      });
+    };
+  }, []);
+
+  useEffect(() => {
+    if (visible) {
+      setIsEnded(false);
+    }
+  }, [visible]);
+
+  const handleOnClose = useCallback(() => {
+    setIsEnded(true);
+    isTutor && onClose();
+  }, [isTutor, onClose]);
 
   return (
-    <Modal
-      onClose={onClose}
-      visible={visible}
-      animation="zoom"
-      maskAnimation="fade"
-      destroyOnClose={true}
-      width="100vw"
-      height="100vh"
-      bodyStyle={{
-        minHeight: "93vh",
-      }}
-    >
-      <WebinarMeetModalStyles>
-        {loading && <ContentLoader />}
-        {!loading && webinarMeetData && (
-          <iframe
-            title={webinarMeetData.data.roomName}
-            src={webinarMeetData.url}
-          />
-        )}
-      </WebinarMeetModalStyles>
-    </Modal>
+    <>
+      <Modal
+        visible={visible}
+        animation="zoom"
+        maskAnimation="fade"
+        destroyOnClose={true}
+        width="100vw"
+        height="100vh"
+        bodyStyle={{
+          minHeight: "100vh",
+          padding: 0,
+          background: "black",
+        }}
+      >
+        <WebinarMeetModalStyles>
+          {loading && <ContentLoader />}
+          <JitsiContainer>
+            <MeetingAnalyticsOverlay
+              onClose={handleOnClose}
+              recordingUrl={recordingUrl}
+              modelType="webinar"
+              webinar={webinar}
+            />
+            {!loading && webinarMeetData && (
+              <JitsyMeeting
+                key={webinarId}
+                jitsyData={webinarMeetData}
+                modelId={webinarId}
+                modelType="webinar"
+                close={handleOnClose}
+                onRecordingAvailable={setRecordingUrl}
+                term={webinar?.active_to ?? ""}
+              />
+            )}
+          </JitsiContainer>
+        </WebinarMeetModalStyles>
+      </Modal>
+
+      {isEnded && (
+        <EndMeetingQuestionnairesModal
+          entityId={webinarId}
+          entityModel={QuestionnaireModelType.WEBINAR}
+          setIsEnded={() => {
+            setIsEnded(false);
+            onClose();
+          }}
+        />
+      )}
+    </>
   );
 };
 
diff --git a/src/components/Webinars/Webinar/WebinarSidebar/Buttons/index.tsx b/src/components/Webinars/Webinar/WebinarSidebar/Buttons/index.tsx
index ab20b3012..316747e76 100644
--- a/src/components/Webinars/Webinar/WebinarSidebar/Buttons/index.tsx
+++ b/src/components/Webinars/Webinar/WebinarSidebar/Buttons/index.tsx
@@ -1,4 +1,4 @@
-import { useContext, useEffect, useMemo, useState } from "react";
+import { useContext, useEffect, useMemo, useState, useCallback } from "react";
 import { EscolaLMSContext } from "@escolalms/sdk/lib/react/context";
 import { isPast } from "date-fns";
 
@@ -87,6 +87,10 @@ const WebinarSidebarButtons = () => {
     }
   }, [webinarInCart, webinarObj, user.value?.id]);
 
+  const handleOnCloseModal = useCallback(() => {
+    setShowMeetModal(false);
+  }, []);
+
   return (
     <>
       {buttonStatus === ButtonStatus.FINISHED && (
@@ -142,11 +146,10 @@ const WebinarSidebarButtons = () => {
         </Button>
       )}
 
-      {/* MEET MODAL */}
       {showMeetModal && webinarObj?.id && (
         <WebinarMeetModal
           visible={showMeetModal}
-          onClose={() => setShowMeetModal(false)}
+          onClose={handleOnCloseModal}
           webinarId={webinarObj.id}
         />
       )}
diff --git a/src/components/_App/Navbar/index.tsx b/src/components/_App/Navbar/index.tsx
index 729a04c36..c285e71df 100644
--- a/src/components/_App/Navbar/index.tsx
+++ b/src/components/_App/Navbar/index.tsx
@@ -647,11 +647,11 @@ const Navbar = () => {
                 //   content: t("Menu.Events"),
                 //   redirect: routeRoutes.events,
                 // },
-                // {
-                //   id: 6,
-                //   content: t("Menu.Webinars"),
-                //   redrect: routeRoutes.webinars,
-                // },
+                {
+                  id: 6,
+                  content: t("Menu.Webinars"),
+                  redirect: routeRoutes.webinars,
+                },
                 // {
                 //   id: 7,
                 //   content: t("Menu.Packages"),
@@ -754,11 +754,11 @@ const Navbar = () => {
                     content: t("Navbar.MyConsultations"),
                     redirect: routeRoutes.myConsultations,
                   },
-                  // {
-                  //   id: 4,
-                  //   content: t("Navbar.MyWebinars"),
-                  //   redirect: routeRoutes.myWebinars,
-                  // },
+                  {
+                    id: 4,
+                    content: t("Navbar.MyWebinars"),
+                    redirect: routeRoutes.myWebinars,
+                  },
                   // {
                   //   id: 5,
                   //   content: t("Navbar.MyStationaryEvents"),
diff --git a/src/hooks/questionnaires/index.tsx b/src/hooks/questionnaires/index.tsx
index a93b15639..6e2f3a243 100644
--- a/src/hooks/questionnaires/index.tsx
+++ b/src/hooks/questionnaires/index.tsx
@@ -38,59 +38,65 @@ export const useQuestionnaires = ({
     [entityId, entityModel, fetchQuestionnaire]
   );
 
-  const getQuestionnaires = useCallback(async () => {
-    setLoading(true);
-    setError(null);
+  const getQuestionnaires = useCallback(
+    async (handleClose?: () => void) => {
+      setLoading(true);
+      setError(null);
 
-    try {
-      const response = await fetchQuestionnaires(entityModel, entityId);
+      try {
+        const response = await fetchQuestionnaires(entityModel, entityId);
 
-      if (response?.success) {
-        const questionnairesWithCombinedQuestions = await Promise.all(
-          response.data.map(async (data) => {
-            const questions = await getQuestionnaire(data.id);
+        if (response?.success) {
+          const questionnairesWithCombinedQuestions = await Promise.all(
+            response.data.map(async (data) => {
+              const questions = await getQuestionnaire(data.id);
 
-            const combinedQuestions = data.questions.reduce(
-              (result, element) => {
-                const matchingElement = questions?.find(
-                  (item) => item.id === element.id
-                );
+              const combinedQuestions = data.questions.reduce(
+                (result, element) => {
+                  const matchingElement = questions?.find(
+                    (item) => item.id === element.id
+                  );
 
-                const updatedElement = {
-                  ...element,
-                  rate: matchingElement?.rate,
-                  note: matchingElement?.note,
-                };
-                result.push(updatedElement);
+                  const updatedElement = {
+                    ...element,
+                    rate: matchingElement?.rate,
+                    note: matchingElement?.note,
+                  };
+                  result.push(updatedElement);
 
-                return result;
-              },
-              [] as API.QuestionnaireQuestion[]
-            );
+                  return result;
+                },
+                [] as API.QuestionnaireQuestion[]
+              );
 
-            return {
-              ...data,
-              questions: combinedQuestions.sort(
-                (a, b) => a.position - b.position
-              ),
-            };
-          })
-        );
+              return {
+                ...data,
+                questions: combinedQuestions.sort(
+                  (a, b) => a.position - b.position
+                ),
+              };
+            })
+          );
 
-        setQuestionnaires(
-          questionnairesWithCombinedQuestions.filter(
-            (q) => q.questions.length > 0
-          )
-        );
+          setQuestionnaires(
+            questionnairesWithCombinedQuestions.filter(
+              (q) => q.questions.length > 0
+            )
+          );
+          questionnairesWithCombinedQuestions.length === 0 &&
+            handleClose &&
+            handleClose();
+        }
+      } catch (error) {
+        setError("Failed to fetch questionnaires");
+        toast(t<string>("UnexpectedError"), "error");
+        console.error(error);
+      } finally {
+        setLoading(false);
       }
-    } catch (error) {
-      setError("Failed to fetch questionnaires");
-      toast(t<string>("UnexpectedError"), "error");
-      console.error(error);
-    } finally {
-      setLoading(false);
-    }
-  }, [entityId, entityModel, fetchQuestionnaires, getQuestionnaire]);
+    },
+    [entityId, entityModel, fetchQuestionnaires, getQuestionnaire]
+  );
 
   const getReviewQuestion = useCallback(
     ({
diff --git a/src/hooks/useAnalyticsWebsockets.ts b/src/hooks/useAnalyticsWebsockets.ts
index 9f43982fd..490ca5d8b 100644
--- a/src/hooks/useAnalyticsWebsockets.ts
+++ b/src/hooks/useAnalyticsWebsockets.ts
@@ -3,60 +3,46 @@ import { getEchoInstance } from "@/utils/websocket";
 import { SocketDataState, MeetingAnalyticsSocketData } from "@/types/sockets";
 
 export const useMeetingSockets = (
-  consultationId?: number,
+  modelId?: number,
   termUnix?: number,
-  token?: string | null
+  token?: string | null,
+  modelType: "consultation" | "webinar" = "consultation"
 ) => {
   const [socketData, setSocketData] = useState<SocketDataState | null>(null);
 
   useEffect(() => {
-    if (!consultationId || !termUnix || !token) return;
+    if (!modelId || !termUnix || !token) return;
 
     const echo = getEchoInstance(token);
     if (!echo) return;
 
-    echo.connector.pusher.connection.bind("connected", () => {
-      console.log("🟢 PUSHER CONNECTED", consultationId, termUnix);
-    });
-
-    echo.connector.pusher.connection.bind("error", (err: any) => {
-      console.log("🔴 PUSHER ERROR", err);
-    });
-
-    const channelName = `consultation.${consultationId}.${termUnix}`;
-    const channel = echo.private(channelName);
+    const channelName = `${modelType}.${modelId}.${termUnix}`;
+    const privateChannel = echo.private(channelName);
 
     const processData = (payload: MeetingAnalyticsSocketData) => {
       if (!payload) return;
       setSocketData({ ...payload, _updatedAt: Date.now() });
     };
 
-    channel.listen(
+    echo.connector.pusher.connection.bind("connected", () => {
+      console.log(`🟢 PUSHER CONNECTED TO ${channelName}`);
+    });
+
+    privateChannel.listen(
       ".AggregatedFrameStored",
-      (data: MeetingAnalyticsSocketData) => {
-        processData(data);
-      }
+      (data: MeetingAnalyticsSocketData) => processData(data)
     );
 
-    channel.listen(
+    privateChannel.listen(
       "AggregatedFrameStored",
-      (data: MeetingAnalyticsSocketData) => {
-        processData(data);
-      }
-    );
-
-    channel.listenToAll(
-      (eventName: string, data: MeetingAnalyticsSocketData) => {
-        if (eventName.includes("AggregatedFrameStored")) {
-          processData(data);
-        }
-      }
+      (data: MeetingAnalyticsSocketData) => processData(data)
     );
 
     return () => {
       echo.leave(channelName);
+      echo.connector.pusher.connection.unbind("connected");
     };
-  }, [consultationId, termUnix, token]);
+  }, [modelId, termUnix, token, modelType]);
 
   return { socketData };
 };
diff --git a/src/hooks/usePerformanceMetrics.ts b/src/hooks/usePerformanceMetrics.ts
index e2e37a971..cc62abec7 100644
--- a/src/hooks/usePerformanceMetrics.ts
+++ b/src/hooks/usePerformanceMetrics.ts
@@ -22,7 +22,6 @@ const usePerformanceMetrics = () => {
       const now = performance.now();
 
       if (now - startTimeRef.current >= 1000) {
-        console.log(`[FPS] Frames Per Second: ${frameCountRef.current}`);
         frameCountRef.current = 0;
         startTimeRef.current = now;
       }
diff --git a/src/pages/static-page/index.tsx b/src/pages/static-page/index.tsx
index 198126042..e549d1b56 100644
--- a/src/pages/static-page/index.tsx
+++ b/src/pages/static-page/index.tsx
@@ -58,6 +58,7 @@ const StaticPage = () => {
 
   const mainTabs = useMemo(() => {
     let items = pages?.list?.data;
+
     items = pages?.list?.data.filter((item) => !item.slug.includes("mobile"));
     return (
       items &&
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
new file mode 100644
index 000000000..0165ba215
--- /dev/null
+++ b/src/utils/constants.ts
@@ -0,0 +1,2 @@
+export const JITSY_TUTOR_INTERVAL = 15000;
+export const JITSY_ANALYTICS_INTERVAL = 1000;
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 60009ecd4..df498d1e7 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -386,3 +386,17 @@ export const getFormattedDifferenceRelativeToNow = (time: Date) => {
 export const relativeTimeFormatter = new Intl.RelativeTimeFormat("pl", {
   style: "short",
 });
+
+export const getDateParts = (timestamp: number) => {
+  const date = new Date(timestamp);
+  const pad = (n: number) => n.toString().padStart(2, "0");
+
+  return {
+    yy: date.getFullYear(),
+    mm: pad(date.getMonth() + 1),
+    dd: pad(date.getDate()),
+    hh: pad(date.getHours()),
+    mi: pad(date.getMinutes()),
+    ss: pad(date.getSeconds()),
+  };
+};
diff --git a/src/workers/dataUrlWorker.ts b/src/workers/dataUrlWorker.ts
index 31431bed5..7c28f427d 100644
--- a/src/workers/dataUrlWorker.ts
+++ b/src/workers/dataUrlWorker.ts
@@ -29,7 +29,7 @@ self.onmessage = async (event: MessageEvent<WorkerMessage>) => {
 
     const blob = await offscreenCanvas.convertToBlob({
       type: "image/webp",
-      quality: 1.0,
+      quality: 0.5,
     });
 
     self.postMessage({ success: true, blob } as WorkerResponse);
diff --git a/src/workers/saveImageWorker.ts b/src/workers/saveImageWorker.ts
index cd3f52406..42d5e2c68 100644
--- a/src/workers/saveImageWorker.ts
+++ b/src/workers/saveImageWorker.ts
@@ -1,19 +1,23 @@
+import { getDateParts } from "@/utils/index";
+
 export {};
 
 export interface Screenshot {
   dataURL: Blob;
   timestamp: number;
   userID: number;
-  consultationId: number | undefined;
 }
 
 export interface SaveImagesMessage {
-  consultationId: number;
-  consultationTermId: number;
-  userEmail: string;
-  userId: number;
+  action?: "recommender-screens";
+  modelId: number;
+  modelType: "consultation" | "webinar";
   screenshots: Screenshot[];
   term: string;
+  userId: number;
+  consultationTermId?: number;
+  userEmail?: string;
+  token?: string;
   apiUrl?: string;
 }
 
@@ -22,122 +26,145 @@ let API_URL: string;
 const retryFetch = async (
   url: string,
   options: RequestInit,
-  retries: number = 3,
-  delay: number = 2000
+  retries = 3,
+  delay = 2000
 ): Promise<Response> => {
-  return new Promise((resolve, reject) => {
-    const attemptFetch = async (attempt: number) => {
-      try {
-        const response = await fetch(url, options);
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        resolve(response);
-      } catch (error) {
-        console.error(`Fetch attempt ${attempt + 1} failed:`, error);
-
-        if (attempt < retries - 1) {
-          setTimeout(() => attemptFetch(attempt + 1), delay);
-        } else {
-          reject(`Retries exhausted. Last error: ${error}`);
-        }
-      }
-    };
-
-    attemptFetch(0);
-  });
+  for (let i = 0; i < retries; i++) {
+    try {
+      const response = await fetch(url, options);
+      if (response.ok) return response;
+      throw new Error(`HTTP ${response.status}`);
+    } catch (err) {
+      if (i === retries - 1) throw err;
+      await new Promise((r) => setTimeout(r, delay));
+    }
+  }
+  throw new Error("Fetch failed after retries");
 };
 
-function getFormattedFilename(screenshot: Screenshot): string {
-  const date = new Date(screenshot.timestamp);
-  const pad = (n: number) => n.toString().padStart(2, "0");
-
-  const formattedTimestamp =
-    `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}_` +
-    `${pad(date.getHours())}_${pad(date.getMinutes())}_${pad(
-      date.getSeconds()
-    )}`;
-
-  return `${screenshot.userID}_${screenshot.consultationId}_${formattedTimestamp}.webp`;
+function getFormattedFilename(screenshot: Screenshot, modelId: number): string {
+  const p = getDateParts(screenshot.timestamp);
+  const ts = `${p.yy}${p.mm}${p.dd}_${p.hh}_${p.mi}_${p.ss}`;
+  return `${screenshot.userID}_${modelId}_${ts}.webp`;
 }
 
+const formatToSQL = (timestamp: number) => {
+  const p = getDateParts(timestamp);
+  return `${p.yy}-${p.mm}-${p.dd} ${p.hh}:${p.mi}:${p.ss}`;
+};
+
 self.onmessage = async (event: MessageEvent<SaveImagesMessage>) => {
+  if (event.data.apiUrl) {
+    API_URL = event.data.apiUrl;
+    return;
+  }
+
   const {
-    consultationId,
-    consultationTermId,
-    userEmail,
-    userId,
+    action,
+    modelId,
+    modelType,
     screenshots,
     term,
+    userId,
+    userEmail,
+    consultationTermId,
+    token,
   } = event.data;
 
-  if (event.data.apiUrl) {
-    API_URL = event.data.apiUrl; // Store the environment variable
-    return; // Exit early if it's just setting the API URL
-  }
-
-  try {
-    const filenames = screenshots.map((screenshot) => ({
-      filename: getFormattedFilename(screenshot),
-    }));
+  if (action === "recommender-screens") {
+    try {
+      const formData = new FormData();
+      formData.append("model_id", modelId.toString());
+      formData.append("model_type", modelType);
+      formData.append("term", term);
+
+      screenshots.forEach((s, index) => {
+        const filename = getFormattedFilename(s, modelId);
+        const file = new File([s.dataURL], filename, { type: "image/webp" });
+        formData.append(`files[${index}][file]`, file, filename);
+        formData.append(`files[${index}][timestamp]`, formatToSQL(s.timestamp));
+      });
+
+      const response = await fetch(
+        `${API_URL}/api/recommender/meet-recordings/screens`,
+        {
+          method: "POST",
+          headers: { Authorization: `Bearer ${token}` },
+          body: formData,
+        }
+      );
 
-    const signUrls = await retryFetch(
-      `${API_URL}/api/consultations/signed-screen-urls`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          consultation_id: consultationId,
-          user_termin_id: consultationTermId,
-          user_id: userId,
-          user_email: userEmail,
-          files: filenames,
-          executed_at: term,
-        }),
+      if (!response.ok) {
+        throw new Error(
+          `Recommender API error: ${response.status} ${response.statusText}`
+        );
       }
-    );
 
-    if (!signUrls.ok) {
-      throw new Error(`Failed to sign URLs: ${signUrls.statusText}`);
+      self.postMessage({ success: true, type: "recommender" });
+    } catch (error) {
+      console.error("Worker Recommender Error:", error);
+      self.postMessage({ success: false, type: "recommender", error });
     }
+    return;
+  }
 
-    const responseData = await signUrls.json();
+  try {
+    const filenames = screenshots.map((s) => ({
+      filename: getFormattedFilename(s, modelId),
+    }));
+    const endpoint =
+      modelType === "webinar"
+        ? `${API_URL}/api/webinars/signed-screen-urls`
+        : `${API_URL}/api/consultations/signed-screen-urls`;
+
+    const payload =
+      modelType === "webinar"
+        ? {
+            webinar_id: modelId,
+            user_id: userId,
+            executed_at: term,
+            files: filenames,
+          }
+        : {
+            consultation_id: modelId,
+            user_termin_id: consultationTermId,
+            user_id: userId,
+            user_email: userEmail,
+            files: filenames,
+            executed_at: term,
+          };
+
+    const signRes = await retryFetch(endpoint, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(payload),
+    });
 
-    for (let i = 0; i < responseData.data.length; i++) {
-      const { url, filename } = responseData.data[i];
-      const screenshot = screenshots.find(
-        (s) => getFormattedFilename(s) === filename
-      );
+    const responseData = await signRes.json();
 
-      if (!screenshot) {
-        console.warn(`Screenshot not found for filename: ${filename}`);
-        continue;
-      }
+    await Promise.all(
+      responseData.data.map(async (item: { filename: string; url: string }) => {
+        const screenshot = screenshots.find(
+          (s) => getFormattedFilename(s, modelId) === item.filename
+        );
+        if (!screenshot) return;
+        const blobToUpload = new Blob([screenshot.dataURL]);
 
-      try {
-        const blob = new Blob([screenshot.dataURL]);
-        const response = await fetch(url, {
+        const uploadRes = await fetch(item.url, {
           method: "PUT",
-          body: blob,
+          body: blobToUpload,
         });
 
-        if (!response.ok) {
-          console.error(`Failed to upload ${filename}: ${response.statusText}`);
-        } else {
-          console.log(`File ${filename} uploaded successfully.`);
+        if (!uploadRes.ok) {
+          console.error("S3 Upload Failed", uploadRes.status);
+          throw new Error(`S3 Status: ${uploadRes.status}`);
         }
-      } catch (error) {
-        console.error(`Error uploading ${filename}:`, error);
-      }
-    }
+      })
+    );
 
-    self.postMessage({ success: true });
+    self.postMessage({ success: true, type: "analytics" });
   } catch (error) {
-    self.postMessage({
-      success: false,
-      error: error instanceof Error ? error.message : "Unknown error",
-    });
+    console.error("Worker Analytics Error:", error);
+    self.postMessage({ success: false, type: "analytics", error });
   }
 };