diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx
index b27c050445d..2f364bfa732 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.test.tsx
@@ -141,6 +141,14 @@ describe('TableNG Cells renderers', () => {
           expect(container).toBeInTheDocument();
           expect(container.childNodes).toHaveLength(1);
         });
+
+        it('should return AutoCell when cellOptions is unmapped', () => {
+          const field = createField(FieldType.string);
+
+          const { container } = renderCell(field, { type: 'number' } as unknown as TableCellOptions);
+          expect(container).toBeInTheDocument();
+          expect(container.childNodes).toHaveLength(1);
+        });
       });
     });
 
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
index d4a16b1d982..74c773f28ff 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/renderers.tsx
@@ -109,7 +109,7 @@ export function getCellRenderer(field: Field, cellOptions: TableCellOptions): Ta
   if (cellType === TableCellDisplayMode.Auto) {
     return getAutoRendererResult(field);
   }
-  return CELL_RENDERERS[cellType];
+  return CELL_RENDERERS[cellType] ?? AUTO_RENDERER;
 }
 
 /** @internal */