diff --git a/packages/grafana-ui/src/components/FieldConfigs/links.tsx b/packages/grafana-ui/src/components/FieldConfigs/links.tsx
index d11d04eb445..1ac0ec15c43 100644
--- a/packages/grafana-ui/src/components/FieldConfigs/links.tsx
+++ b/packages/grafana-ui/src/components/FieldConfigs/links.tsx
@@ -36,12 +36,13 @@ export const DataLinksValueEditor: React.FC<FieldConfigEditorProps<DataLink[], D
   };
 
   const onDataLinkAdd = () => {
-    const links = cloneDeep(value);
+    const links = cloneDeep(value) || [];
 
     links.push({
       title: '',
       url: '',
     });
+
     onChange(links);
   };
 
diff --git a/packages/grafana-ui/src/components/FieldConfigs/standardFieldConfigEditors.tsx b/packages/grafana-ui/src/components/FieldConfigs/standardFieldConfigEditors.tsx
index 0e34560c5bd..3f724e197db 100644
--- a/packages/grafana-ui/src/components/FieldConfigs/standardFieldConfigEditors.tsx
+++ b/packages/grafana-ui/src/components/FieldConfigs/standardFieldConfigEditors.tsx
@@ -148,5 +148,6 @@ export const getStandardFieldConfigs = () => {
     StandardFieldConfigEditors.thresholds,
     StandardFieldConfigEditors.title,
     StandardFieldConfigEditors.noValue,
+    StandardFieldConfigEditors.links,
   ];
 };
diff --git a/public/app/plugins/panel/table2/TablePanel.tsx b/public/app/plugins/panel/table2/TablePanel.tsx
index 1e30e901f61..5e3219c5335 100644
--- a/public/app/plugins/panel/table2/TablePanel.tsx
+++ b/public/app/plugins/panel/table2/TablePanel.tsx
@@ -6,6 +6,7 @@ import { Table } from '@grafana/ui';
 import { PanelProps, applyFieldOverrides } from '@grafana/data';
 import { Options } from './types';
 import { config } from 'app/core/config';
+import { tableFieldRegistry } from './custom';
 
 interface Props extends PanelProps<Options> {}
 
@@ -28,6 +29,7 @@ export class TablePanel extends Component<Props> {
       fieldOptions: options.fieldOptions,
       theme: config.theme,
       replaceVariables,
+      custom: tableFieldRegistry,
     })[0];
 
     return <Table height={height - paddingBottom} width={width} data={dataProcessed} />;