diff --git a/package.json b/package.json
index c9a5c1f..c924b01 100644
--- a/package.json
+++ b/package.json
@@ -50,10 +50,10 @@
   },
   "homepage": "https://discord-player.js.org",
   "dependencies": {
-    "discord-ytdl-core": "^5.0.3",
+    "discord-ytdl-core": "^5.0.4",
     "soundcloud-scraper": "^5.0.0",
     "spotify-url-info": "^2.2.3",
-    "youtube-sr": "^4.1.1",
+    "youtube-sr": "^4.1.5",
     "ytdl-core": "^4.8.2"
   },
   "devDependencies": {
diff --git a/src/Player.ts b/src/Player.ts
index 02c2ddb..69d9a7c 100644
--- a/src/Player.ts
+++ b/src/Player.ts
@@ -490,7 +490,30 @@ export class Player extends EventEmitter {
 
         if (query instanceof Track) track = query;
         else {
-            if (ytdl.validateURL(query)) {
+            for (const [_, extractor] of this.Extractors) {
+                if (extractor.validate(query)) {
+                    const data = await extractor.handle(query);
+                    if (data) {
+                        track = new Track(this, {
+                            title: data.title,
+                            description: data.description,
+                            duration: Util.buildTimeCode(Util.parseMS(data.duration)),
+                            thumbnail: data.thumbnail,
+                            author: data.author,
+                            views: data.views,
+                            engine: data.engine,
+                            source: data.source ?? 'arbitrary',
+                            fromPlaylist: false,
+                            requestedBy: message.author,
+                            url: data.url
+                        });
+
+                        if (extractor.important) break;
+                    }
+                }
+            }
+
+            if (!track && ytdl.validateURL(query)) {
                 const info = await ytdl.getBasicInfo(query).catch(() => {});
                 if (!info) return void this.emit(PlayerEvents.NO_RESULTS, message, query);
                 if (info.videoDetails.isLiveContent && !this.options.enableLive) return void this.emit(PlayerEvents.ERROR, PlayerErrorEventCodes.LIVE_VIDEO, message, new PlayerError('Live video is not enabled!'));
@@ -510,29 +533,6 @@ export class Player extends EventEmitter {
                     live: Boolean(info.videoDetails.isLiveContent)
                 });
             } else {
-                for (const [_, extractor] of this.Extractors) {
-                    if (extractor.validate(query)) {
-                        const data = await extractor.handle(query);
-                        if (data) {
-                            track = new Track(this, {
-                                title: data.title,
-                                description: data.description,
-                                duration: Util.buildTimeCode(Util.parseMS(data.duration)),
-                                thumbnail: data.thumbnail,
-                                author: data.author,
-                                views: data.views,
-                                engine: data.engine,
-                                source: data.source ?? 'arbitrary',
-                                fromPlaylist: false,
-                                requestedBy: message.author,
-                                url: data.url
-                            });
-
-                            if (extractor.important) break;
-                        }
-                    }
-                }
-
                 if (!track) track = await this._searchTracks(message, query, firstResult);
             }
         }
diff --git a/yarn.lock b/yarn.lock
index c8709a6..05e68f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1423,18 +1423,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.14.5, browserslist@^4.16.4:
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
-  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
-  dependencies:
-    caniuse-lite "^1.0.30001219"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.723"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
-browserslist@^4.16.6:
+browserslist@^4.16.4, browserslist@^4.16.6:
   version "4.16.6"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
   integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -1497,11 +1486,6 @@ caniuse-lite@^1.0.30001219:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
   integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
 
-caniuse-lite@^1.0.30001219:
-  version "1.0.30001230"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
-  integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1916,10 +1900,10 @@ diff@^4.0.1:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-discord-ytdl-core@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/discord-ytdl-core/-/discord-ytdl-core-5.0.3.tgz#a31560f0bede41d6fc969377083ae958deac2b72"
-  integrity sha512-q4GOEFiV19l0OcPezXnkDWualf+n96LcbTEWReceiDHdx4xxn5CXZX9PR4iDTXQR3Kv2VUkwB8RO8dI50d88vQ==
+discord-ytdl-core@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/discord-ytdl-core/-/discord-ytdl-core-5.0.4.tgz#84a2af1a8e8c235b4fc109b23350d12782ab66cd"
+  integrity sha512-O+G9wuCw5TERR9iHZFMYnYQbs/ZGudDc9cxa1OKSV5TdcBYrHGS1JqvE90ZvSQ6SmS4XvqtOf/Okls6yiGJ3sg==
   dependencies:
     prism-media "^1.2.9"
 
@@ -2033,11 +2017,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.723:
-  version "1.3.740"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.740.tgz#e38b7d2b848f632191b643e6dabca51be2162922"
-  integrity sha512-Mi2m55JrX2BFbNZGKYR+2ItcGnR4O5HhrvgoRRyZQlaMGQULqDhoGkLWHzJoshSzi7k1PUofxcDbNhlFrDZNhg==
-
 electron-to-chromium@^1.3.723:
   version "1.3.742"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.742.tgz#7223215acbbd3a5284962ebcb6df85d88b95f200"
@@ -4753,10 +4732,10 @@ yargs@^14.0.0:
     y18n "^4.0.0"
     yargs-parser "^15.0.1"
 
-youtube-sr@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/youtube-sr/-/youtube-sr-4.1.1.tgz#e8fec9d2e0b430910bdedb77667a8dd54250cf4f"
-  integrity sha512-5MluT51vQG39BaL6oKIEBoVkeA2y0aAbRoktbrH/b0y2s2hyhXnbTlR99JIvlSHd9I3sQxLQ2MWxwTjW9yK9xw==
+youtube-sr@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/youtube-sr/-/youtube-sr-4.1.5.tgz#f35627574a47b6d5b39dec792e8bb00f93e04809"
+  integrity sha512-yLTtjy8ougH6ReCEsCRN9mxgS+rcm44421pYxown3QR9bUivNjxkYwB1+OfW+Z9V9hBE/chp9y7SBpK63vrk7g==
   dependencies:
     node-fetch "^2.6.1"