diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java
index f3bab4bb5..62a0e7375 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java
@@ -30,6 +30,11 @@ public class YoutubePlaylistLinkHandlerFactory extends ListLinkHandlerFactory {
                 throw new ParsingException("the url given is not a Youtube-URL");
             }
 
+            String path = urlObj.getPath();
+            if (!path.equals("/watch" ) && !path.equals("/playlist")) {
+                throw new ParsingException("the url given is neither a video nor a playlist URL");
+            }
+
             String listID = Utils.getQueryValue(urlObj, "list");
 
             if (listID == null) {