diff --git a/src/lib/listing/table/table.component.html b/src/lib/listing/table/table.component.html
index e4281f0..6ae05c6 100644
--- a/src/lib/listing/table/table.component.html
+++ b/src/lib/listing/table/table.component.html
@@ -20,7 +20,9 @@
 
 <iqser-empty-state *ngIf="listingComponent.noMatch$ | async" [text]="noMatchText"></iqser-empty-state>
 
-<cdk-virtual-scroll-viewport #scrollViewport [itemSize]="itemSize" iqserHasScrollbar>
+<cdk-virtual-scroll-viewport [class.no-data]="(listingComponent.noMatch$ | async) || (listingComponent.entitiesService.noData$ | async)"
+                             [itemSize]="itemSize"
+                             iqserHasScrollbar>
     <div
         (mouseenter)="itemMouseEnterFn && itemMouseEnterFn(entity)"
         (mouseleave)="itemMouseLeaveFn && itemMouseLeaveFn(entity)"
diff --git a/src/lib/listing/table/table.component.scss b/src/lib/listing/table/table.component.scss
index cab94c2..b6c834f 100644
--- a/src/lib/listing/table/table.component.scss
+++ b/src/lib/listing/table/table.component.scss
@@ -4,6 +4,10 @@
     height: calc(100vh - 50px - 31px - 111px);
     overflow-y: hidden !important;
 
+    &.no-data {
+        display: none;
+    }
+
     &.has-scrollbar:hover ::ng-deep.cdk-virtual-scroll-content-wrapper {
         grid-template-columns: var(--gridTemplateColumnsHover);
     }