diff --git a/utils/metadata.js b/utils/metadata.js
index 9210b2e..ae0ad01 100644
--- a/utils/metadata.js
+++ b/utils/metadata.js
@@ -1,91 +1,83 @@
 const fetch = require('node-fetch')
 
 async function getInstance() {
-    const instances = await (await fetch('https://piped-instances.kavin.rocks/')).json()
-    return (instances[Math.floor(Math.random() * instances.length)]).api_url
+    for (let i = 0; i < 5; i++) {
+        const test = await actualRequest()
+        if (test) return test
+    }
+
+    async function getActualInstance() {
+        const instances = await (await fetch('https://piped-instances.kavin.rocks/')).json()
+        return (instances[Math.floor(Math.random() * instances.length)]).api_url    
+    }
+
+    async function testInstance(instance) {
+        try {
+            const videoRequest = await fetch(`${instance}/streams/dQw4w9WgXcQ`)
+            const videoJson = await videoRequest.json()
+            const thumbnailRequest = await fetch(videoJson.thumbnailUrl)
+        
+            return (videoRequest.status == 200) && (thumbnailRequest.status == 200)
+        } catch (e) {
+            return false
+        }
+    }
+
+    async function actualRequest() {
+        try {
+            const instance = await getActualInstance()
+            const instanceTest = await testInstance(instance)
+
+            if (instanceTest) return instance
+            else return false
+        } catch (e) {
+            return false
+        }
+    }
+
 }
 
 async function getVideoMetadata(id) {
-    for (let i = 0; i < 5; i++) {
-        const video = await actualRequest()
-        if (video) return video
-    }
-
-    async function actualRequest() {
-        try {
-            const instance = await getInstance()
-            const json = await (await fetch(`${instance}/streams/${id}`)).json()
-            return json
-        } catch (e) {
-            return false
-        }
-    }
+    const instance = await getInstance()
+    const json = await (await fetch(`${instance}/streams/${id}`)).json()
+    return json
 }
 
 async function getChannel(id) {
-    for (let i = 0; i < 5; i++) {
-        const channel = await actualRequest()
-        if (channel) return channel
-    }
-
-    async function actualRequest() {
-        try {
-            const instance = await getInstance()
-            const json = await (await fetch(`${instance}/channel/${id}`)).json()
-            return json
-        } catch (e) {
-            return false
-        }
-    }
+    const instance = await getInstance()
+    const json = await (await fetch(`${instance}/channel/${id}`)).json()
+    return json
 }
 
 async function getChannelVideos(id) {
-    for (let i = 0; i < 5; i++) {
-        const videos = await actualRequest()
-        if (videos) return videos
-    }
+    return new Promise(async (resolve, reject) => {
+        try {
+            const videos = []
+            const instance = await getInstance()
+            const json = await (await fetch(`${instance}/channel/${id}`)).json()
+            videos.push(...json.relatedStreams)
+            if (json.nextpage) await getNextPage(json.nextpage)
+            else resolve(videos)
+            
+            async function getNextPage(payload) {
+                const page = await (await fetch(`${instance}/nextpage/channel/${id}?nextpage=${encodeURIComponent(payload)}`)).json()
+                videos.push(...page.relatedStreams)
 
-    async function actualRequest() {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const videos = []
-                const instance = await getInstance()
-                const json = await (await fetch(`${instance}/channel/${id}`)).json()
-                videos.push(...json.relatedStreams)
-                if (json.nextpage) await getNextPage(json.nextpage)
+                if (videos.length >= 210) resolve(videos)
+                if (page.nextpage) await getNextPage(page.nextpage)
                 else resolve(videos)
-                
-                async function getNextPage(payload) {
-                    const page = await (await fetch(`${instance}/nextpage/channel/${id}?nextpage=${encodeURIComponent(payload)}`)).json()
-                    videos.push(...page.relatedStreams)
-
-                    if (videos.length >= 210) resolve(videos)
-                    if (page.nextpage) await getNextPage(page.nextpage)
-                    else resolve(videos)
-                }
-
-            } catch (e) {
-                resolve(false)
             }
-        })
-    }
+
+        } catch (e) {
+            resolve(false)
+        }
+    })
 }
 
 async function getPlaylistVideos(id) {
-    for (let i = 0; i < 5; i++) {
-        const playlists = await actualRequest()
-        if (playlists) return playlists
-    }
-
-    async function actualRequest() {
-        try {
-            const instance = await getInstance()
-            const json = await (await fetch(`${instance}/playlists/${id}`)).json()
-            return json
-        } catch (e) {
-            return false
-        }
-    }
+    const instance = await getInstance()
+    const json = await (await fetch(`${instance}/playlists/${id}`)).json()
+    return json
 }
 
 module.exports = { getInstance, getVideoMetadata, getChannel, getChannelVideos, getPlaylistVideos }
\ No newline at end of file
diff --git a/utils/websocket.js b/utils/websocket.js
index da1832f..c062865 100644
--- a/utils/websocket.js
+++ b/utils/websocket.js
@@ -7,7 +7,7 @@ const upload = require('./upload.js')
 async function createDatabaseVideo(id, videoUrl, playlistId) {
     const data = await metadata.getVideoMetadata(id)
     const uploaderAvatar = await upload.uploadImage((data.uploaderUrl).replace('/channel/', ''), data.uploaderAvatar)
-    const thumbnailUrl = await upload.uploadImage(id, `https://i.ytimg.com/vi_webp/${id}/maxresdefault.webp`)
+    const thumbnailUrl = await upload.uploadImage(id, data.thumbnailUrl)
     
     await prisma.videos.create({
         data: {