diff --git a/frontend/app/components/Session/LivePlayer.tsx b/frontend/app/components/Session/LivePlayer.tsx
index 5cc27b51f..060ff1b8f 100644
--- a/frontend/app/components/Session/LivePlayer.tsx
+++ b/frontend/app/components/Session/LivePlayer.tsx
@@ -44,6 +44,7 @@ function LivePlayer({
 
   useEffect(() => {
     if (!usedSession.sessionId || contextValue.player !== undefined) return;
+    console.debug('creating live player for', usedSession.sessionId)
     const sessionWithAgentData = {
       ...usedSession,
       agentInfo: {
@@ -67,10 +68,7 @@ function LivePlayer({
       setContextValue({ player, store });
       playerInst = player;
     }
-  }, [usedSession.sessionId]);
 
-  // not cleaning up in multiview
-  useEffect(() => {
     return () => {
       if (!location.pathname.includes('multiview') || !location.pathname.includes(usedSession.sessionId)) {
         playerInst?.clean?.();
@@ -78,7 +76,7 @@ function LivePlayer({
         setContextValue(defaultContextValue)
       }
     }
-  }, [location.pathname])
+  }, [location.pathname]);
 
   // LAYOUT (TODO: local layout state - useContext or something..)
   useEffect(() => {
diff --git a/frontend/app/components/Session/LiveSession.js b/frontend/app/components/Session/LiveSession.js
index b47527a8d..f7cc625d5 100644
--- a/frontend/app/components/Session/LiveSession.js
+++ b/frontend/app/components/Session/LiveSession.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { useEffect } from 'react';
 import { connect } from 'react-redux';
 import usePageTitle from 'App/hooks/usePageTitle';
-import { fetch as fetchSession } from 'Duck/sessions';
+import { fetch as fetchSession, clearCurrentSession } from 'Duck/sessions';
 import { fetchList as fetchSlackList } from 'Duck/integrations/slack';
 import { Loader } from 'UI';
 import withPermissions from 'HOCs/withPermissions';
@@ -17,6 +17,7 @@ function LiveSession({
     hasSessionsPath,
     session,
     fetchFailed,
+    clearCurrentSession,
 }) {
     const [initialLoading, setInitialLoading] = React.useState(true);
     usePageTitle('OpenReplay Assist');
@@ -24,6 +25,10 @@ function LiveSession({
     useEffect(() => {
         clearLogs();
         fetchSlackList();
+
+        return () => {
+            clearCurrentSession()
+        };
     }, []);
 
     useEffect(() => {
@@ -46,7 +51,7 @@ function LiveSession({
 
     return (
         <Loader className="flex-1" loading={initialLoading}>
-            <LivePlayer />
+            {session.sessionId && <LivePlayer />}
         </Loader>
     );
 }
@@ -77,6 +82,7 @@ export default withPermissions(
         {
             fetchSession,
             fetchSlackList,
+            clearCurrentSession,
         }
     )(LiveSession)
 );