diff --git a/common/framework/drivers/push/fcmv1.php b/common/framework/drivers/push/fcmv1.php
index 6cd947749..390161af0 100644
--- a/common/framework/drivers/push/fcmv1.php
+++ b/common/framework/drivers/push/fcmv1.php
@@ -151,7 +151,8 @@ class FCMv1 extends Base implements PushInterface
 			foreach ($responses as $i => $response)
 			{
 				$status_code = $response->getStatusCode();
-				$result = @json_decode($response->getBody()->getContents());
+				$result_text = $response->getBody()->getContents();
+				$result = @json_decode($result_text);
 				if ($status_code === 200)
 				{
 					$output->success[$tokens[$i]] = $result->name ?? '';
@@ -164,6 +165,10 @@ class FCMv1 extends Base implements PushInterface
 					{
 						$output->invalid[$tokens[$i]] = $tokens[$i];
 					}
+					elseif (str_contains($error_message, 'Requested entity was not found'))
+					{
+						$output->invalid[$tokens[$i]] = $tokens[$i];
+					}
 				}
 				else
 				{
@@ -196,7 +201,8 @@ class FCMv1 extends Base implements PushInterface
 			foreach ($responses as $i => $response)
 			{
 				$status_code = $response->getStatusCode();
-				$result = @json_decode($response->getBody()->getContents());
+				$result_text = $response->getBody()->getContents();
+				$result = @json_decode($result_text);
 				if ($status_code === 200)
 				{
 					$output->success[$topics[$i]] = $result->name ?? '';