diff --git a/public/app/plugins/panel/barchart/utils.test.ts b/public/app/plugins/panel/barchart/utils.test.ts
index 99edf5007ea1..73fc1da5f29c 100644
--- a/public/app/plugins/panel/barchart/utils.test.ts
+++ b/public/app/plugins/panel/barchart/utils.test.ts
@@ -174,7 +174,7 @@ describe('BarChart utils', () => {
       });
       const result = prepareBarChartDisplayValues([df], createTheme(), { stacking: StackingMode.None } as Options);
       const warning = assertIsDefined('warn' in result ? result : null);
-      expect(warning.warn).toEqual('Bar charts requires a string or time field');
+      expect(warning.warn).toEqual('No Data');
       expect(warning).not.toHaveProperty('viz');
     });
 
diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts
index 12ffde2be580..84750da580a2 100644
--- a/public/app/plugins/panel/barchart/utils.ts
+++ b/public/app/plugins/panel/barchart/utils.ts
@@ -457,7 +457,7 @@ export function prepareBarChartDisplayValues(
 
   if (!firstField) {
     return {
-      warn: 'Bar charts requires a string or time field',
+      warn: 'No Data',
     };
   }