diff --git a/src/features/MatchSidePlaylists/components/TabVideo/index.tsx b/src/features/MatchSidePlaylists/components/TabVideo/index.tsx
index dcfe083d..92248928 100644
--- a/src/features/MatchSidePlaylists/components/TabVideo/index.tsx
+++ b/src/features/MatchSidePlaylists/components/TabVideo/index.tsx
@@ -19,7 +19,6 @@ import { usePageParams } from 'hooks/usePageParams'
 
 import { VideoDate } from './components/VideoDate'
 import { MatchesWrapper } from './styled'
-import { useScroll } from '../../useScroll'
 
 type Props = {
   profile: MatchInfo,
@@ -40,8 +39,6 @@ export const TabVideo = ({
 
   const [selectedDate, setSelectedDate] = useState(profileDate)
 
-  const { hasScroll, ref } = useScroll([selectedDate])
-
   const matches = useMemo(() => (
     tournamentData.matches.filter((match) => (
       formatDate(match.date) === selectedDate && match.id !== profileId
@@ -73,10 +70,7 @@ export const TabVideo = ({
         profileDate={profileDate}
         onDateClick={setSelectedDate}
       />
-      <MatchesWrapper
-        hasScroll={hasScroll}
-        ref={ref}
-      >
+      <MatchesWrapper>
         {
           map(sortBy(matches, ({ live }) => !live), (match) => (
             <MatchCard
diff --git a/src/features/MatchSidePlaylists/components/TabVideo/styled.tsx b/src/features/MatchSidePlaylists/components/TabVideo/styled.tsx
index 69fe7d38..e9b0b502 100644
--- a/src/features/MatchSidePlaylists/components/TabVideo/styled.tsx
+++ b/src/features/MatchSidePlaylists/components/TabVideo/styled.tsx
@@ -2,14 +2,10 @@ import styled, { css } from 'styled-components/macro'
 import { customScrollbar } from 'features/Common'
 import { isMobileDevice } from '../../../../config/userAgent'
 
-type TMatchesWrapper = {
-  hasScroll: boolean,
-}
-
-export const MatchesWrapper = styled.div<TMatchesWrapper>`
+export const MatchesWrapper = styled.div`
   overflow-y: auto;
   max-height: calc(100vh - 170px);
-  ${({ hasScroll }) => (hasScroll ? css`padding-right: 5px;` : '')}
+  padding-right: 5px;
 
   > * {
     margin-bottom: 15px;
diff --git a/src/features/MatchSidePlaylists/index.tsx b/src/features/MatchSidePlaylists/index.tsx
index 27bbe8bf..f4eb1acb 100644
--- a/src/features/MatchSidePlaylists/index.tsx
+++ b/src/features/MatchSidePlaylists/index.tsx
@@ -1,4 +1,8 @@
-import { useRef } from 'react'
+import {
+  useEffect,
+  useRef,
+  useState,
+} from 'react'
 
 import type { PlaylistOption } from 'features/MatchPage/types'
 import { Tab, TabsGroup } from 'features/Common'
@@ -14,7 +18,6 @@ import { TabEvents } from './components/TabEvents'
 import { TabWatch } from './components/TabWatch'
 import { TabVideo } from './components/TabVideo'
 import { useMatchSidePlaylists } from './hooks'
-import { useScroll } from './useScroll'
 import {
   Wrapper,
   TabsWrapper,
@@ -54,13 +57,25 @@ export const MatchSidePlaylists = ({
 
   const TabPane = tabPanes[selectedTab]
 
-  const { hasScroll, ref } = useScroll([
+  const containerRef = useRef<HTMLDivElement | null>(null)
+  const tabPaneContainerRef = useRef<HTMLDivElement | null>(null)
+
+  const [hasTabPaneScroll, setTabPaneScroll] = useState(false)
+
+  useEffect(() => {
+    const {
+      clientHeight = 0,
+      scrollHeight = 0,
+    } = tabPaneContainerRef.current || {}
+    const hasScroll = scrollHeight > clientHeight
+
+    setTabPaneScroll(hasScroll)
+  }, [
     playlists,
     selectedTab,
+    tabPaneContainerRef,
   ])
 
-  const containerRef = useRef<HTMLDivElement | null>(null)
-
   useEventListener({
     callback: () => {
       const screenLandscape = isIOS ? window.orientation : window.screen.orientation.type
@@ -108,8 +123,8 @@ export const MatchSidePlaylists = ({
 
       </TabsWrapper>
       <Container
-        hasScroll={hasScroll}
-        ref={ref}
+        hasScroll={hasTabPaneScroll}
+        ref={tabPaneContainerRef}
         forVideoTab={selectedTab === Tabs.VIDEO}
       >
         <TabPane
diff --git a/src/features/MatchSidePlaylists/useScroll.tsx b/src/features/MatchSidePlaylists/useScroll.tsx
deleted file mode 100644
index 4144e212..00000000
--- a/src/features/MatchSidePlaylists/useScroll.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import {
-  useEffect,
-  useRef,
-  useState,
-} from 'react'
-
-export const useScroll = (deps: any) => {
-  const ref = useRef<HTMLDivElement | null>(null)
-
-  const [hasRefScroll, setRefScroll] = useState(false)
-
-  useEffect(() => {
-    const {
-      clientHeight = 0,
-      scrollHeight = 0,
-    } = ref.current || {}
-    const hasScroll = scrollHeight > clientHeight
-
-    setRefScroll(hasScroll)
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [ref, ...deps])
-
-  return {
-    hasScroll: hasRefScroll,
-    ref,
-  }
-}