diff --git a/packages/grafana-ui/src/components/Table/Table.test.tsx b/packages/grafana-ui/src/components/Table/Table.test.tsx
index e69cb013f13..d4f537c54df 100644
--- a/packages/grafana-ui/src/components/Table/Table.test.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.test.tsx
@@ -104,7 +104,7 @@ describe('Table', () => {
       getTestContext({ data: toDataFrame([]) });
       expect(getTable()).toBeInTheDocument();
       expect(screen.queryByRole('row')).not.toBeInTheDocument();
-      expect(screen.getByText(/no data to show/i)).toBeInTheDocument();
+      expect(screen.getByText(/No data/i)).toBeInTheDocument();
     });
   });
 
diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index c5d804f8c63..1f4623a96bb 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -223,7 +223,7 @@ export const Table: FC<Props> = memo((props: Props) => {
             </FixedSizeList>
           ) : (
             <div style={{ height: height - headerHeight }} className={tableStyles.noData}>
-              No data to show
+              No data
             </div>
           )}
         </div>
diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx
index 6040f5b49df..9e0623998e9 100644
--- a/public/app/plugins/panel/table/TablePanel.tsx
+++ b/public/app/plugins/panel/table/TablePanel.tsx
@@ -108,7 +108,7 @@ export class TablePanel extends Component<Props> {
     const hasFields = data.series[0]?.fields.length;
 
     if (!count || !hasFields) {
-      return <div>No data</div>;
+      return <div className={tableStyles.noData}>No data</div>;
     }
 
     if (count > 1) {
@@ -143,6 +143,13 @@ const tableStyles = {
     justify-content: space-between;
     height: 100%;
   `,
+  noData: css`
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  `,
   selectWrapper: css`
     padding: 8px;
   `,