diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
index 15a80a950..15a3fdbbc 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -98,8 +98,9 @@ public class YoutubeExtractor implements Extractor {
         try {
             URI uri = new URI(videoUrl);
             if(uri.getHost().contains("youtube")) {
-                String query = uri.getQuery();
-                String queryElements[] = query.split("&");
+                String fragment = uri.getFragment();
+                fragment = fragment.replace("/watch?", "");
+                String queryElements[] = fragment.split("&");
                 Map<String, String> queryArguments = new HashMap<>();
                 for (String e : queryElements) {
                     String[] s = e.split("=");