diff --git a/src/app/components/data-viewer/data-viewer.component.html b/src/app/components/data-viewer/data-viewer.component.html
index 9ed98e4..4099b64 100644
--- a/src/app/components/data-viewer/data-viewer.component.html
+++ b/src/app/components/data-viewer/data-viewer.component.html
@@ -52,7 +52,7 @@
       <ng-container matColumnDef="checkbox">
         <th mat-header-cell *matHeaderCellDef class="checkbox-col">
           <mat-checkbox (change)="masterCheckboxToggle($event)"
-                        [checked]="hasKeys() && isAllSelected()"
+                        [checked]="hasKeys() && isAllSelected() && data.length > 0"
                         [indeterminate]="hasKeys() && !isAllSelected()">
           </mat-checkbox>
         </th>