diff --git a/projects/v3/src/app/components/activity/activity.component.html b/projects/v3/src/app/components/activity/activity.component.html
index 5b9f6562b..63cca5a0e 100644
--- a/projects/v3/src/app/components/activity/activity.component.html
+++ b/projects/v3/src/app/components/activity/activity.component.html
@@ -3,7 +3,7 @@
     <h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">
       {{ activity.name }}
     </h1>
-    <ion-skeleton-text *ngIf="!activity.name" animated style="width: 50%;" aria-hidden="true"></ion-skeleton-text>
+    <ion-skeleton-text *ngIf="!activity.tasks" animated style="width: 50%;" aria-hidden="true"></ion-skeleton-text>
 
     <div class="task-count">
       <ion-text *ngIf="activity.tasks" class="subtitle-3" color="grey-75" i18n>
@@ -20,6 +20,9 @@ <h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">
 
   <ng-container *ngIf="isForTeamOnly === false; else notInATeamAndForTeamOnly">
     <ion-item class="headline-4 task-header" lines="none" i18n>{activity.tasks.length, plural, =1 {Task} other {Tasks}}</ion-item>
+
+    <ng-container *ngTemplateOutlet="noTasks"></ng-container>
+
     <app-list-item class="focusable"
       role="button"
       tabindex="0"
@@ -44,15 +47,10 @@ <h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">
 <ng-template #notInATeamAndForTeamOnly>
   <ion-item class="headline-4 task-header" lines="none" i18n>{activity.tasks.length, plural, =1 {Task} other
     {Tasks}}</ion-item>
-  <app-list-item class="focusable"
-    role="button"
-    tabindex="0"
-    lines="full"
-    subtitle1Color="grey-50"
+  <app-list-item class="focusable" role="button" tabindex="0" lines="full" subtitle1Color="grey-50"
     title="For team members only"></app-list-item>
 </ng-template>
 
-
 <ng-template #noActivity>
   <div *ngIf="!activity" class="ion-padding"
     aria-live="polite" aria-label="loading">
@@ -63,4 +61,8 @@ <h1 id="activity-name" *ngIf="activity.name" class="headline-2 activity-name">
   </div>
 </ng-template>
 
-
+<ng-template #noTasks>
+  <div *ngIf="activity?.tasks?.length === 0" class="ion-padding" aria-live="polite" aria-label="no tasks available">
+    <app-list-item lines="none" subtitle1Color="grey-50" title="No tasks available." i18n-title></app-list-item>
+  </div>
+</ng-template>
diff --git a/projects/v3/src/app/services/activity.service.ts b/projects/v3/src/app/services/activity.service.ts
index 39f112378..62e5d4cf8 100644
--- a/projects/v3/src/app/services/activity.service.ts
+++ b/projects/v3/src/app/services/activity.service.ts
@@ -126,9 +126,9 @@ export class ActivityService {
     }
     return this.getActivityBase(id).pipe(
       map(res => this._normaliseActivity(res.data, goToNextTask, afterTask))
-    ).subscribe(_res => {
+    ).subscribe(res => {
       if (callback instanceof Function) {
-        return callback(_res);
+        return callback(res);
       }
       return;
     });
@@ -247,7 +247,7 @@ export class ActivityService {
     }
 
     // if there is no next task
-    if (!nextTask) {
+    if (this.utils.isEmpty(nextTask)) {
       if (afterTask) {
         this.assessment.getAssessment(
           afterTask.id,
@@ -259,7 +259,10 @@ export class ActivityService {
       }
       nextTask = tasks[0]; // go to the first task
     }
-    this.goToTask(nextTask);
+
+    if (!this.utils.isEmpty(nextTask)) {
+      return this.goToTask(nextTask);
+    }
   }
 
   // obtain latest activity to decide next task