diff --git a/src/addon/block/comments/providers/block-handler.ts b/src/addon/block/comments/providers/block-handler.ts
index 81e5b2c15..ada6e1654 100644
--- a/src/addon/block/comments/providers/block-handler.ts
+++ b/src/addon/block/comments/providers/block-handler.ts
@@ -47,7 +47,7 @@ export class AddonBlockCommentsHandler extends CoreBlockBaseHandler {
             component: CoreBlockOnlyTitleComponent,
             link: 'CoreCommentsViewerPage',
             linkParams: { contextLevel: contextLevel, instanceId: instanceId,
-                component: 'block_comments', area: 'page_comments', itemId: 0 }
+                componentName: 'block_comments', area: 'page_comments', itemId: 0 }
         };
     }
 }
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index 0f606feee..e84d27e0c 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -156,7 +156,7 @@ export class CoreCommentsViewerPage implements OnDestroy {
                 this.canAddComments = this.addDeleteCommentsAvailable && response.canpost;
 
                 const comments = response.comments.sort((a, b) => b.timecreated - a.timecreated);
-                this.canLoadMore = comments.length >= CoreCommentsProvider.pageSize;
+                this.canLoadMore = comments.length > 0 && comments.length >= CoreCommentsProvider.pageSize;
 
                 return Promise.all(comments.map((comment) => {
                     // Get the user profile image.