diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
index 8b924cf93..6ea588341 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -110,20 +110,18 @@ public class YoutubeParsingHelper {
         return host.equalsIgnoreCase("invidio.us")
                 || host.equalsIgnoreCase("dev.invidio.us")
                 || host.equalsIgnoreCase("www.invidio.us")
+                || host.equalsIgnoreCase("vid.encryptionin.space")
                 || host.equalsIgnoreCase("invidious.snopyta.org")
-                || host.equalsIgnoreCase("fi.invidious.snopyta.org")
                 || host.equalsIgnoreCase("yewtu.be")
-                || host.equalsIgnoreCase("invidious.ggc-project.de")
-                || host.equalsIgnoreCase("yt.maisputain.ovh")
-                || host.equalsIgnoreCase("invidious.13ad.de")
-                || host.equalsIgnoreCase("invidious.toot.koeln")
-                || host.equalsIgnoreCase("invidious.fdn.fr")
-                || host.equalsIgnoreCase("watch.nettohikari.com")
-                || host.equalsIgnoreCase("invidious.snwmds.net")
-                || host.equalsIgnoreCase("invidious.snwmds.org")
-                || host.equalsIgnoreCase("invidious.snwmds.com")
-                || host.equalsIgnoreCase("invidious.sunsetravens.com")
-                || host.equalsIgnoreCase("invidious.gachirangers.com");
+                || host.equalsIgnoreCase("tube.connect.cafe")
+                || host.equalsIgnoreCase("invidious.zapashcanon.fr")
+                || host.equalsIgnoreCase("invidious.kavin.rocks")
+                || host.equalsIgnoreCase("invidious.tube")
+                || host.equalsIgnoreCase("invidious.site")
+                || host.equalsIgnoreCase("invidious.xyz")
+                || host.equalsIgnoreCase("vid.mint.lgbt")
+                || host.equalsIgnoreCase("invidiou.site")
+                || host.equalsIgnoreCase("invidious.fdn.fr");
     }
 
     /**
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java
index efc06da2a..c37dff517 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java
@@ -186,20 +186,18 @@ public class YoutubeStreamLinkHandlerFactory extends LinkHandlerFactory {
             case "WWW.INVIDIO.US":
             case "DEV.INVIDIO.US":
             case "INVIDIO.US":
+            case "VID.ENCRYPTIONIN.SPACE":
             case "INVIDIOUS.SNOPYTA.ORG":
-            case "FI.INVIDIOUS.SNOPYTA.ORG":
             case "YEWTU.BE":
-            case "INVIDIOUS.GGC-PROJECT.DE":
-            case "YT.MAISPUTAIN.OVH":
-            case "INVIDIOUS.13AD.DE":
-            case "INVIDIOUS.TOOT.KOELN":
-            case "INVIDIOUS.FDN.FR":
-            case "WATCH.NETTOHIKARI.COM":
-            case "INVIDIOUS.SNWMDS.NET":
-            case "INVIDIOUS.SNWMDS.ORG":
-            case "INVIDIOUS.SNWMDS.COM":
-            case "INVIDIOUS.SUNSETRAVENS.COM":
-            case "INVIDIOUS.GACHIRANGERS.COM": { // code-block for hooktube.com and Invidious instances
+            case "TUBE.CONNECT.CAFE":
+            case "INVIDIOUS.ZAPASHCANON.FR":
+            case "INVIDIOUS.KAVIN.ROCKS":
+            case "INVIDIOUS.TUBE":
+            case "INVIDIOUS.SITE":
+            case "INVIDIOUS.XYZ":
+            case "VID.MINT.LGBT":
+            case "INVIDIOU.SITE":
+            case "INVIDIOUS.FDN.FR": { // code-block for hooktube.com and Invidious instances
                 if (path.equals("watch")) {
                     String viewQueryValue = Utils.getQueryValue(url, "v");
                     if (viewQueryValue != null) {