diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 8b3c6c9af..93933ebf2 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -253,10 +253,11 @@ public int getItemViewType(int position) {
         if (position == infoItemList.size() && showFooter) {
             return FOOTER_TYPE;
         }
-        if (shouldUseExperimentalNewUi(layoutInflater.getContext())) {
+        final InfoItem item = infoItemList.get(position);
+        if (shouldUseExperimentalNewUi(layoutInflater.getContext())
+                && item.getInfoType() != InfoItem.InfoType.COMMENT) {
             return COMPOSE_HOLDER_TYPE;
         }
-        final InfoItem item = infoItemList.get(position);
         switch (item.getInfoType()) {
             case STREAM:
                 if (itemMode == ItemViewMode.CARD) {