diff --git a/src/components/ServerConnections.js b/src/components/ServerConnections.js
index 9920b9baa..38692998f 100644
--- a/src/components/ServerConnections.js
+++ b/src/components/ServerConnections.js
@@ -1,5 +1,5 @@
 // NOTE: This is used for jsdoc return type
-// eslint-disable-next-line no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Api } from '@jellyfin/sdk';
 import { MINIMUM_VERSION } from '@jellyfin/sdk/lib/versions';
 import { ConnectionManager, Credentials, ApiClient } from 'jellyfin-apiclient';
@@ -18,7 +18,6 @@ const normalizeImageOptions = options => {
 };
 
 const getMaxBandwidth = () => {
-    /* eslint-disable compat/compat */
     if (navigator.connection) {
         let max = navigator.connection.downlinkMax;
         if (max && max > 0 && max < Number.POSITIVE_INFINITY) {
@@ -28,7 +27,6 @@ const getMaxBandwidth = () => {
             return parseInt(max, 10);
         }
     }
-    /* eslint-enable compat/compat */
 
     return null;
 };
diff --git a/src/components/apphost.js b/src/components/apphost.js
index 984c3a77b..7d4908856 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -452,7 +452,7 @@ let isHidden = false;
 let hidden;
 let visibilityChange;
 
-if (typeof document.hidden !== 'undefined') { /* eslint-disable-line compat/compat */
+if (typeof document.hidden !== 'undefined') {
     hidden = 'hidden';
     visibilityChange = 'visibilitychange';
 } else if (typeof document.webkitHidden !== 'undefined') {
@@ -461,7 +461,6 @@ if (typeof document.hidden !== 'undefined') { /* eslint-disable-line compat/comp
 }
 
 document.addEventListener(visibilityChange, function () {
-    /* eslint-disable-next-line compat/compat */
     if (document[hidden]) {
         onAppHidden();
     } else {
diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js
index 561c96862..c41b0d59f 100644
--- a/src/components/images/imageLoader.js
+++ b/src/components/images/imageLoader.js
@@ -2,7 +2,7 @@ import Worker from './blurhash.worker.ts'; // eslint-disable-line import/default
 import * as lazyLoader from '../lazyLoader/lazyLoaderIntersectionObserver';
 import * as userSettings from '../../scripts/settings/userSettings';
 import './style.scss';
-// eslint-disable-next-line compat/compat
+
 const worker = new Worker();
 const targetDic = {};
 worker.addEventListener(
diff --git a/src/components/listview/List/Lists.tsx b/src/components/listview/List/Lists.tsx
index 1215851cc..3a45be39c 100644
--- a/src/components/listview/List/Lists.tsx
+++ b/src/components/listview/List/Lists.tsx
@@ -25,7 +25,6 @@ const Lists: FC<ListsProps> = ({ items = [], listOptions = {} }) => {
     const renderListItem = (item: ItemDto, index: number) => {
         return (
             <List
-                // eslint-disable-next-line react/no-array-index-key
                 key={`${item.Id}-${index}`}
                 index={index}
                 item={item}
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index c9b7ae157..9c8982b51 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -13,7 +13,6 @@ function onOneDocumentClick() {
 
     // don't request notification permissions if they're already granted or denied
     if (window.Notification && window.Notification.permission === 'default') {
-        /* eslint-disable-next-line compat/compat */
         Notification.requestPermission();
     }
 }
diff --git a/src/components/playback/playbackorientation.js b/src/components/playback/playbackorientation.js
index b581801f9..a1d89cc7e 100644
--- a/src/components/playback/playbackorientation.js
+++ b/src/components/playback/playbackorientation.js
@@ -17,7 +17,6 @@ Events.on(playbackManager, 'playbackstart', function (e, player) {
     const isLocalVideo = player.isLocalPlayer && !player.isExternalPlayer && playbackManager.isPlayingVideo(player);
 
     if (isLocalVideo && layoutManager.mobile) {
-        /* eslint-disable-next-line compat/compat */
         const lockOrientation = window.screen.lockOrientation || window.screen.mozLockOrientation || window.screen.msLockOrientation || (window.screen.orientation?.lock);
 
         if (lockOrientation) {
@@ -38,7 +37,6 @@ Events.on(playbackManager, 'playbackstart', function (e, player) {
 
 Events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) {
     if (orientationLocked && !playbackStopInfo.nextMediaType) {
-        /* eslint-disable-next-line compat/compat */
         const unlockOrientation = window.screen.unlockOrientation || window.screen.mozUnlockOrientation || window.screen.msUnlockOrientation || (window.screen.orientation?.unlock);
 
         if (unlockOrientation) {
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 8e43667e4..1c28888b3 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -1352,7 +1352,7 @@ export default function (view) {
             case 'GamepadDPadLeft':
             case 'GamepadLeftThumbstickLeft':
                 // Ignores gamepad events that are always triggered, even when not focused.
-                if (document.hasFocus()) { /* eslint-disable-line compat/compat */
+                if (document.hasFocus()) {
                     playbackManager.rewind(currentPlayer);
                     showOsd(btnRewind);
                 }
@@ -1361,7 +1361,7 @@ export default function (view) {
             case 'GamepadDPadRight':
             case 'GamepadLeftThumbstickRight':
                 // Ignores gamepad events that are always triggered, even when not focused.
-                if (document.hasFocus()) { /* eslint-disable-line compat/compat */
+                if (document.hasFocus()) {
                     playbackManager.fastForward(currentPlayer);
                     showOsd(btnFastForward);
                 }
diff --git a/src/plugins/chromecastPlayer/plugin.js b/src/plugins/chromecastPlayer/plugin.js
index 59b01e15c..868f02691 100644
--- a/src/plugins/chromecastPlayer/plugin.js
+++ b/src/plugins/chromecastPlayer/plugin.js
@@ -1109,7 +1109,8 @@ class ChromecastPlayer {
         return this.getPlayerStateInternal()?.NowPlayingItem?.IndexNumber;
     }
 
-    clearQueue(currentTime) { // eslint-disable-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    clearQueue(currentTime) {
         // not supported yet
     }
 }
diff --git a/src/plugins/syncPlay/core/players/GenericPlayer.js b/src/plugins/syncPlay/core/players/GenericPlayer.js
index 2093191e6..ff127b1a0 100644
--- a/src/plugins/syncPlay/core/players/GenericPlayer.js
+++ b/src/plugins/syncPlay/core/players/GenericPlayer.js
@@ -158,7 +158,7 @@ class GenericPlayer {
      * Sets the playback rate, if supported.
      * @param {number} value The playback rate.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     setPlaybackRate(value) {
         // Do nothing.
     }
@@ -197,7 +197,7 @@ class GenericPlayer {
      * Seeks the player to the specified position.
      * @param {number} positionTicks The new position.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localSeek(positionTicks) {
         // Override
     }
@@ -213,7 +213,7 @@ class GenericPlayer {
      * Sends a command to the player.
      * @param {Object} command The command.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localSendCommand(command) {
         // Override
     }
@@ -222,7 +222,7 @@ class GenericPlayer {
      * Starts playback.
      * @param {Object} options Playback data.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localPlay(options) {
         // Override
     }
@@ -231,7 +231,7 @@ class GenericPlayer {
      * Sets playing item from playlist.
      * @param {string} playlistItemId The item to play.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localSetCurrentPlaylistItem(playlistItemId) {
         // Override
     }
@@ -240,7 +240,7 @@ class GenericPlayer {
      * Removes items from playlist.
      * @param {Array} playlistItemIds The items to remove.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localRemoveFromPlaylist(playlistItemIds) {
         // Override
     }
@@ -250,7 +250,7 @@ class GenericPlayer {
      * @param {string} playlistItemId The item to move.
      * @param {number} newIndex The new position.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localMovePlaylistItem(playlistItemId, newIndex) {
         // Override
     }
@@ -259,7 +259,7 @@ class GenericPlayer {
      * Queues in the playlist.
      * @param {Object} options Queue data.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localQueue(options) {
         // Override
     }
@@ -268,7 +268,7 @@ class GenericPlayer {
      * Queues after the playing item in the playlist.
      * @param {Object} options Queue data.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localQueueNext(options) {
         // Override
     }
@@ -291,7 +291,7 @@ class GenericPlayer {
      * Sets repeat mode.
      * @param {string} value The repeat mode.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localSetRepeatMode(value) {
         // Override
     }
@@ -300,7 +300,7 @@ class GenericPlayer {
      * Sets shuffle mode.
      * @param {string} value The shuffle mode.
      */
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     localSetQueueShuffleMode(value) {
         // Override
     }
diff --git a/src/scripts/gamepadtokey.js b/src/scripts/gamepadtokey.js
index da3b88e27..571c06c32 100644
--- a/src/scripts/gamepadtokey.js
+++ b/src/scripts/gamepadtokey.js
@@ -178,7 +178,7 @@ function resetThrottle(key) {
 const isElectron = navigator.userAgent.toLowerCase().indexOf('electron') !== -1;
 function allowInput() {
     // This would be nice but always seems to return true with electron
-    if (!isElectron && document.hidden) { /* eslint-disable-line compat/compat */
+    if (!isElectron && document.hidden) {
         return false;
     }
 
@@ -356,7 +356,6 @@ function isGamepadConnected() {
 }
 
 function onFocusOrGamepadAttach() {
-    /* eslint-disable-next-line compat/compat */
     if (isGamepadConnected() && document.hasFocus()) {
         console.log('Gamepad connected! Starting input loop');
         startInputLoop();
@@ -364,7 +363,6 @@ function onFocusOrGamepadAttach() {
 }
 
 function onFocusOrGamepadDetach() {
-    /* eslint-disable-next-line compat/compat */
     if (!isGamepadConnected() || !document.hasFocus()) {
         console.log('Gamepad disconnected! No other gamepads are connected, stopping input loop');
         stopInputLoop();
diff --git a/src/scripts/keyboardNavigation.js b/src/scripts/keyboardNavigation.js
index 8e5797cd8..d98c70ed0 100644
--- a/src/scripts/keyboardNavigation.js
+++ b/src/scripts/keyboardNavigation.js
@@ -239,7 +239,7 @@ function attachGamepadScript() {
 }
 
 // No need to check for gamepads manually at load time, the eventhandler will be fired for that
-if (navigator.getGamepads && appSettings.enableGamepad()) { /* eslint-disable-line compat/compat */
+if (navigator.getGamepads && appSettings.enableGamepad()) {
     window.addEventListener('gamepadconnected', attachGamepadScript);
 }