diff --git a/public/app/plugins/panel/table/renderer.ts b/public/app/plugins/panel/table/renderer.ts
index 474e9c89493..e4d3626c3b9 100644
--- a/public/app/plugins/panel/table/renderer.ts
+++ b/public/app/plugins/panel/table/renderer.ts
@@ -214,15 +214,10 @@ export class TableRenderer {
     var style = '';
     var cellClasses = [];
     var cellClass = '';
-    var linkClass = '';
-
-    if (this.colorState.row) {
-      linkClass = 'table-panel-link';
-    }
 
     if (this.colorState.cell) {
       style = ' style="background-color:' + this.colorState.cell + ';color: white"';
-      linkClass = 'table-panel-link';
+      cellClasses.push('white');
       this.colorState.cell = null;
     } else if (this.colorState.value) {
       style = ' style="color:' + this.colorState.value + '"';
@@ -257,13 +252,12 @@ export class TableRenderer {
       var cellTarget = column.style.linkTargetBlank ? '_blank' : '';
 
       cellClasses.push('table-panel-cell-link');
+
+      if (this.colorState.row) {
+        cellClasses.push('white');
+      }
       columnHtml += `
-        <a href="${cellLink}"
-           target="${cellTarget}"
-           data-link-tooltip
-           data-original-title="${cellLinkTooltip}"
-           data-placement="right"
-           class="${linkClass}">
+        <a href="${cellLink}" target="${cellTarget}" data-link-tooltip data-original-title="${cellLinkTooltip}" data-placement="right">
           ${value}
         </a>
       `;
diff --git a/public/app/plugins/panel/table/specs/renderer.jest.ts b/public/app/plugins/panel/table/specs/renderer.jest.ts
index f1a686fb739..22957d1aa66 100644
--- a/public/app/plugins/panel/table/specs/renderer.jest.ts
+++ b/public/app/plugins/panel/table/specs/renderer.jest.ts
@@ -268,7 +268,7 @@ describe('when rendering table', () => {
       var expectedHtml = `
         <td class="table-panel-cell-link">
           <a href="/dashboard?param=host1&param_1=1230&param_2=40"
-            target="_blank" data-link-tooltip data-original-title="host1 1230 my.host.com" data-placement="right" class="">
+            target="_blank" data-link-tooltip data-original-title="host1 1230 my.host.com" data-placement="right">
             host1
           </a>
         </td>
diff --git a/public/sass/components/_panel_table.scss b/public/sass/components/_panel_table.scss
index 99e91f8ff67..c793cd408b6 100644
--- a/public/sass/components/_panel_table.scss
+++ b/public/sass/components/_panel_table.scss
@@ -87,6 +87,12 @@
         height: 100%;
         display: inline-block;
       }
+
+      &.white {
+        a {
+          color: white;
+        }
+      }
     }
 
     &.cell-highlighted:hover {