diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java
index cd80a9b01..ea9465809 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemsCollector.java
@@ -112,12 +112,6 @@ public class CommentsInfoItemsCollector extends InfoItemsCollector<CommentsInfoI
     }
 
     public List<CommentsInfoItem> getCommentsInfoItemList() {
-        List<CommentsInfoItem> siiList = new ArrayList<>();
-        for (InfoItem ii : super.getItems()) {
-            if (ii instanceof CommentsInfoItem) {
-                siiList.add((CommentsInfoItem) ii);
-            }
-        }
-        return siiList;
+        return new ArrayList<>(super.getItems());
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsExtractor.java
index 776de3232..eb4432a39 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsExtractor.java
@@ -101,7 +101,7 @@ public class YoutubeCommentsExtractor extends CommentsExtractor {
 
         if (itemSectionRenderer.isPresent()) {
             token = JsonUtils.getString(((JsonObject) itemSectionRenderer.get())
-                    .getObject("itemSectionRenderer").getArray("contents").getObject(0),
+                            .getObject("itemSectionRenderer").getArray("contents").getObject(0),
                     "continuationItemRenderer.continuationEndpoint.continuationCommand.token");
         } else {
             token = null;
@@ -140,10 +140,13 @@ public class YoutubeCommentsExtractor extends CommentsExtractor {
             return null;
         }
 
+        final JsonObject continuationItemRenderer = jsonArray.getObject(jsonArray.size() - 1).getObject("continuationItemRenderer");
+
+        final String jsonPath = continuationItemRenderer.has("button") ? "button.buttonRenderer.command.continuationCommand.token" : "continuationEndpoint.continuationCommand.token";
+
         final String continuation;
         try {
-            continuation = JsonUtils.getString(jsonArray.getObject(jsonArray.size() - 1),
-                    "continuationItemRenderer.continuationEndpoint.continuationCommand.token");
+            continuation = JsonUtils.getString(continuationItemRenderer, jsonPath);
         } catch (final Exception e) {
             return null;
         }
@@ -167,7 +170,7 @@ public class YoutubeCommentsExtractor extends CommentsExtractor {
 
         final Localization localization = getExtractorLocalization();
         final byte[] body = JsonWriter.string(prepareDesktopJsonBuilder(localization,
-                        getExtractorContentCountry())
+                getExtractorContentCountry())
                 .value("continuation", page.getId())
                 .done())
                 .getBytes(UTF_8);
@@ -236,7 +239,7 @@ public class YoutubeCommentsExtractor extends CommentsExtractor {
             throws IOException, ExtractionException {
         final Localization localization = getExtractorLocalization();
         final byte[] body = JsonWriter.string(prepareDesktopJsonBuilder(localization,
-                        getExtractorContentCountry())
+                getExtractorContentCountry())
                 .value("videoId", getId())
                 .done())
                 .getBytes(UTF_8);