diff --git a/frontend/src/lib/dashboard/getQueryResults.ts b/frontend/src/lib/dashboard/getQueryResults.ts
index 0290a574cd..e3f956c32a 100644
--- a/frontend/src/lib/dashboard/getQueryResults.ts
+++ b/frontend/src/lib/dashboard/getQueryResults.ts
@@ -33,9 +33,11 @@ export async function GetMetricQueryRange(
 	);
 
 	if (response.statusCode >= 400) {
-		throw new Error(
-			`API responded with ${response.statusCode} -  ${response.error} status: ${response.message}, errors: ${response?.body}`,
-		);
+		let error = `API responded with ${response.statusCode} -  ${response.error} status: ${response.message}`;
+		if (response.body && !isEmpty(response.body)) {
+			error = `${error}, errors: ${response.body}`;
+		}
+		throw new Error(error);
 	}
 
 	if (response.payload?.data?.result) {