diff --git a/bellows/ezsp/__init__.py b/bellows/ezsp/__init__.py
index 1fc1f8ba..b12d1f38 100644
--- a/bellows/ezsp/__init__.py
+++ b/bellows/ezsp/__init__.py
@@ -417,10 +417,8 @@ async def get_mfg_token(self, token: t.EzspMfgTokenId) -> bytes:
         override_value = None
 
         if FirmwareFeatures.MFG_TOKEN_OVERRIDES in self._xncp_features:
-            try:
+            with contextlib.suppress(InvalidCommandError):
                 override_value = await self.xncp_get_mfg_token_override(token)
-            except InvalidCommandError:
-                pass
 
             LOGGER.debug("XNCP override token %s: %s", token.name, override_value)