diff --git a/src/Extension/MokoWaaS.php b/src/Extension/MokoWaaS.php
index 3ec8e85..628bf69 100644
--- a/src/Extension/MokoWaaS.php
+++ b/src/Extension/MokoWaaS.php
@@ -2650,16 +2650,18 @@ class MokoWaaS extends CMSPlugin
 			$app->enqueueMessage('Grafana heartbeat failed (' . $siteUrl . '): ' . $error, 'warning');
 			Log::add('Heartbeat failed: ' . $error, Log::WARNING, 'mokowaas');
 		}
-		elseif ($code === 200 && ($body['status'] ?? '') === 'registered')
+		elseif ($code === 200)
 		{
+			$status = $body['status'] ?? 'ok';
 			$app->enqueueMessage(
-				'Grafana heartbeat: ' . $siteUrl . ' registered (' . ($body['ds_uid'] ?? '') . ')',
+				'Grafana heartbeat: ' . $siteUrl . ' ' . $status . ' (' . ($body['ds_uid'] ?? '') . ')',
 				'message'
 			);
 		}
 		else
 		{
-			$msg = sprintf('Grafana heartbeat failed (%s): HTTP %d', $siteUrl, $code);
+			$msg = sprintf('Grafana heartbeat failed (%s): HTTP %d — %s',
+				$siteUrl, $code, $body['error'] ?? $body['message'] ?? 'Unknown');
 			$app->enqueueMessage($msg, 'warning');
 			Log::add($msg, Log::WARNING, 'mokowaas');
 		}
diff --git a/src/script.php b/src/script.php
index d18f6de..bd4cd4a 100644
--- a/src/script.php
+++ b/src/script.php
@@ -829,17 +829,18 @@ class plgSystemMokoWaaSInstallerScript implements InstallerScriptInterface
 			$app->enqueueMessage('Grafana heartbeat failed: ' . $error, 'warning');
 			Log::add('Heartbeat failed: ' . $error, Log::WARNING, 'mokowaas');
 		}
-		elseif ($code === 200 && ($body['status'] ?? '') === 'registered')
+		elseif ($code === 200)
 		{
+			$status = $body['status'] ?? 'ok';
 			$app->enqueueMessage(
-				'Grafana heartbeat: site registered (' . ($body['ds_uid'] ?? '') . ')',
+				'Grafana heartbeat: ' . $status . ' (' . ($body['ds_uid'] ?? '') . ')',
 				'message'
 			);
 		}
 		else
 		{
 			$msg = sprintf('Grafana heartbeat failed: HTTP %d — %s',
-				$code, $body['error'] ?? 'Unknown');
+				$code, $body['error'] ?? $body['message'] ?? 'Unknown');
 			$app->enqueueMessage($msg, 'warning');
 			Log::add($msg, Log::WARNING, 'mokowaas');
 		}