diff --git a/src/app/components/admin-data-page/admin-data-page.component.html b/src/app/components/admin-data-page/admin-data-page.component.html
index d8166e9..1a5e3b6 100644
--- a/src/app/components/admin-data-page/admin-data-page.component.html
+++ b/src/app/components/admin-data-page/admin-data-page.component.html
@@ -62,11 +62,11 @@
     <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
   </mat-table>
   <mat-paginator #paginator
-                 [length]="dataSource.filteredData.length"
+                 [length]="dataSource ? 'dataSource.filteredData.length' : '10'"
                  [pageIndex]="0"
                  [pageSize]="10"
                  [pageSizeOptions]="[5, 10, 25, 100]"
-                 *ngIf="isLoaded">
+                >
   </mat-paginator>
 </div>
 
diff --git a/src/app/components/admin-data-page/admin-data-page.component.ts b/src/app/components/admin-data-page/admin-data-page.component.ts
index 49f650c..13fb26a 100644
--- a/src/app/components/admin-data-page/admin-data-page.component.ts
+++ b/src/app/components/admin-data-page/admin-data-page.component.ts
@@ -162,8 +162,13 @@ export class AdminDataPageComponent implements OnInit {
   }
 
   afterLoad(){
-    this.dataSource.paginator = this.paginator;
-    this.dataSource.sort = this.sort;
+    
+    setTimeout(() => {
+      this.dataSource.paginator = this.paginator;
+      this.dataSource.sort = this.sort;
+    }, );
+    
+    //this.refreshTable();
   }
 
   orderData(id: string, start?: "asc" | "desc") {