diff --git a/frontend/src/Call/CallPlayer.js b/frontend/src/Call/CallPlayer.js
index b476b65..22706c9 100644
--- a/frontend/src/Call/CallPlayer.js
+++ b/frontend/src/Call/CallPlayer.js
@@ -508,7 +508,7 @@ function CallPlayer(props) {
             style={{ minHeight: '100vh' }}
           >
             <div ref={loadNewerRef} />
-            <ListCalls callsData={callsData} activeCallId={currentCallId} talkgroups={talkgroupsData?talkgroupsData.talkgroups:false} playCall={playCall} />
+            <ListCalls callsData={callsData} activeCallId={isPlaying?currentCallId:false} talkgroups={talkgroupsData?talkgroupsData.talkgroups:false} playCall={playCall} />
             <div ref={loadOlderRef} style={{ height: 50 }} />
 
 
diff --git a/frontend/src/Call/ListCalls.js b/frontend/src/Call/ListCalls.js
index 7d187e5..3aa621f 100644
--- a/frontend/src/Call/ListCalls.js
+++ b/frontend/src/Call/ListCalls.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useLayoutEffect, useRef } from "react";
 import CallItem from "./CallItem";
 import {
   Icon,
@@ -17,7 +17,6 @@ const ListCalls = (props) => {
     useEffect(() => {
       if (activeCallRef.current) {
         activeCallRef.current.scrollIntoView({
-          behavior: "smooth",
           block: "center",
         });
     }