diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
index 0e574d1b6..ea3292663 100644
--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
@@ -93,7 +93,7 @@ export class GfImportActivitiesDialog implements OnDestroy {
   public isLoading = false;
   public mode: 'DIVIDEND';
   public pageIndex = 0;
-  public pageSize = 10;
+  public pageSize = 8;
   public selectedActivities: Activity[] = [];
   public sortColumn = 'date';
   public sortDirection: SortDirection = 'desc';
diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
index 819293800..508fdd753 100644
--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
@@ -21,9 +21,10 @@
           <ng-container i18n>Select File</ng-container>
         }
       </ng-template>
-      <div class="pt-3">
+      <div>
         @if (mode === 'DIVIDEND') {
           <form
+            class="pt-3"
             [formGroup]="assetProfileForm"
             (ngSubmit)="onLoadDividends(stepper)"
           >
@@ -114,7 +115,7 @@
           <ng-container i18n>Select Activities</ng-container>
         }
       </ng-template>
-      <div class="pt-3">
+      <div>
         @if (errorMessages?.length === 0) {
           @if (importStep === 1) {
             <gf-activities-table
@@ -155,25 +156,27 @@
             </button>
           </div>
         } @else {
-          <mat-accordion displayMode="flat">
-            @for (message of errorMessages; track message; let i = $index) {
-              <mat-expansion-panel [disabled]="!details[i]">
-                <mat-expansion-panel-header class="pl-1">
-                  <mat-panel-title>
-                    <div class="d-flex">
-                      <div class="align-items-center d-flex mr-2">
-                        <ion-icon name="warning-outline" />
+          <div class="pt-3">
+            <mat-accordion displayMode="flat">
+              @for (message of errorMessages; track message; let i = $index) {
+                <mat-expansion-panel [disabled]="!details[i]">
+                  <mat-expansion-panel-header class="pl-1">
+                    <mat-panel-title>
+                      <div class="d-flex">
+                        <div class="align-items-center d-flex mr-2">
+                          <ion-icon name="warning-outline" />
+                        </div>
+                        <div>{{ message }}</div>
                       </div>
-                      <div>{{ message }}</div>
-                    </div>
-                  </mat-panel-title>
-                </mat-expansion-panel-header>
-                @if (details[i]) {
-                  <pre class="m-0"><code>{{ details[i] | json }}</code></pre>
-                }
-              </mat-expansion-panel>
-            }
-          </mat-accordion>
+                    </mat-panel-title>
+                  </mat-expansion-panel-header>
+                  @if (details[i]) {
+                    <pre class="m-0"><code>{{ details[i] | json }}</code></pre>
+                  }
+                </mat-expansion-panel>
+              }
+            </mat-accordion>
+          </div>
           <div class="d-flex justify-content-end mt-3">
             <button mat-button (click)="onReset(stepper)">
               <ng-container i18n>Back</ng-container>
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index 0ff4acf4e..4be9fbec6 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -169,7 +169,9 @@ export class GfActivitiesTableComponent
   }
 
   public ngAfterViewInit() {
-    this.dataSource.paginator = this.paginator;
+    if (this.dataSource) {
+      this.dataSource.paginator = this.paginator;
+    }
 
     this.sort.sortChange.subscribe((value: Sort) => {
       this.sortChanged.emit(value);