diff --git a/frontend/src/container/GridCardLayout/GridCard/index.tsx b/frontend/src/container/GridCardLayout/GridCard/index.tsx
index 598f4dd708..7ebcc65e5c 100644
--- a/frontend/src/container/GridCardLayout/GridCard/index.tsx
+++ b/frontend/src/container/GridCardLayout/GridCard/index.tsx
@@ -92,9 +92,9 @@ function GridCardGraph({
 					},
 				],
 				createDataset: undefined,
-				isWarningLimit: true,
+				isWarningLimit: widget.panelTypes === PANEL_TYPES.TIME_SERIES,
 			}),
-		[queryResponse],
+		[queryResponse, widget?.panelTypes],
 	);
 
 	const isEmptyLayout = widget?.id === PANEL_TYPES.EMPTY_WIDGET;
diff --git a/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraph.tsx b/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraph.tsx
index c3edb0a9f1..fd46163807 100644
--- a/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraph.tsx
+++ b/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraph.tsx
@@ -1,6 +1,7 @@
 import { WarningOutlined } from '@ant-design/icons';
 import { Card, Tooltip, Typography } from 'antd';
 import Spinner from 'components/Spinner';
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import {
 	errorTooltipPosition,
 	tooltipStyles,
@@ -67,7 +68,7 @@ function WidgetGraph({
 			{ queryData: getWidgetQueryRange.data?.payload.data.result ?? [] },
 		],
 		createDataset: undefined,
-		isWarningLimit: true,
+		isWarningLimit: selectedWidget.panelTypes === PANEL_TYPES.TIME_SERIES,
 	});
 
 	return (