diff --git a/frontend/src/modules/Metrics/ErrorRateChart.tsx b/frontend/src/modules/Metrics/ErrorRateChart.tsx
index 116b29192c..8740844128 100644
--- a/frontend/src/modules/Metrics/ErrorRateChart.tsx
+++ b/frontend/src/modules/Metrics/ErrorRateChart.tsx
@@ -188,7 +188,7 @@ class ErrorRateChart extends React.Component<ErrorRateChartProps> {
 					ycoordinate={this.state.ycoordinate}
 				>
 					<PopUpElements onClick={this.gotoTracesHandler}>View Traces</PopUpElements>
-					<PopUpElements onClick={this.gotoAlertsHandler}>Set Alerts</PopUpElements>
+					{/* <PopUpElements onClick={this.gotoAlertsHandler}>Set Alerts</PopUpElements> */}
 				</ChartPopUpUnique>
 			);
 		} else return null;
diff --git a/frontend/src/modules/Metrics/LatencyLineChart.tsx b/frontend/src/modules/Metrics/LatencyLineChart.tsx
index 2a9c1bebc8..daf63b43ac 100644
--- a/frontend/src/modules/Metrics/LatencyLineChart.tsx
+++ b/frontend/src/modules/Metrics/LatencyLineChart.tsx
@@ -193,7 +193,7 @@ class LatencyLineChart extends React.Component<LatencyLineChartProps> {
 					>
 						View Traces
 					</PopUpElements>
-					<PopUpElements onClick={this.gotoAlertsHandler}>Set Alerts</PopUpElements>
+					{/* <PopUpElements onClick={this.gotoAlertsHandler}>Set Alerts</PopUpElements> */}
 				</ChartPopUpUnique>
 			);
 		} else return null;
@@ -218,8 +218,8 @@ class LatencyLineChart extends React.Component<LatencyLineChartProps> {
 						borderWidth: 2,
 					},
 					{
-						label: "p90 Latency",
-						data: ndata.map((s) => s.p90 / 1000000), //converting latency from nano sec to ms
+						label: "p95 Latency",
+						data: ndata.map((s) => s.p95 / 1000000), //converting latency from nano sec to ms
 						pointRadius: 0.5,
 						borderColor: "rgba(227, 74, 51, 1.0)",
 						borderWidth: 2,
diff --git a/frontend/src/modules/Metrics/RequestRateChart.tsx b/frontend/src/modules/Metrics/RequestRateChart.tsx
index 81c74c0bb5..c82ee1bd6c 100644
--- a/frontend/src/modules/Metrics/RequestRateChart.tsx
+++ b/frontend/src/modules/Metrics/RequestRateChart.tsx
@@ -177,7 +177,7 @@ class RequestRateChart extends React.Component<RequestRateChartProps> {
 					ycoordinate={this.state.ycoordinate}
 				>
 					<PopUpElements onClick={this.gotoTracesHandler}>View Traces</PopUpElements>
-					<PopUpElements onClick={this.gotoAlertsHandler}>Set Alerts</PopUpElements>
+					{/* <PopUpElements onClick={this.gotoAlertsHandler}>Set Alerts</PopUpElements> */}
 				</ChartPopUpUnique>
 			);
 		} else return null;
diff --git a/frontend/src/store/actions/metrics.ts b/frontend/src/store/actions/metrics.ts
index bd35b2415f..2643f9028f 100644
--- a/frontend/src/store/actions/metrics.ts
+++ b/frontend/src/store/actions/metrics.ts
@@ -19,7 +19,7 @@ export interface servicesListItem {
 export interface metricItem {
 	timestamp: number;
 	p50: number;
-	p90: number;
+	p95: number;
 	p99: number;
 	numCalls: number;
 	callRate: number;