diff --git a/core/notifications/src/executor/fcm/error.rs b/core/notifications/src/executor/fcm/error.rs
index 6d4b86f336..069d808885 100644
--- a/core/notifications/src/executor/fcm/error.rs
+++ b/core/notifications/src/executor/fcm/error.rs
@@ -14,7 +14,8 @@ impl From<google_fcm1::Error> for FcmError {
     fn from(err: google_fcm1::Error) -> Self {
         match err {
             google_fcm1::Error::BadRequest(ref value) => {
-                if value["error"]["status"].as_str() == Some("NOT_FOUND")
+                if value["error"]["code"].as_u64() == Some(404)
+                    && value["error"]["status"].as_str() == Some("NOT_FOUND")
                     && value["error"]["details"]
                         .as_array()
                         .map_or(false, |details| {