diff --git a/custom_components/alexa_media/media_player.py b/custom_components/alexa_media/media_player.py
index 36b2a100..c2d7d317 100644
--- a/custom_components/alexa_media/media_player.py
+++ b/custom_components/alexa_media/media_player.py
@@ -529,6 +529,7 @@ def state(self):
             return STATE_IDLE
         return STATE_STANDBY
 
+    @_catch_login_errors
     async def async_update(self):
         """Get the latest details on a media player.
 
diff --git a/custom_components/alexa_media/switch.py b/custom_components/alexa_media/switch.py
index 2141a158..f0e75590 100644
--- a/custom_components/alexa_media/switch.py
+++ b/custom_components/alexa_media/switch.py
@@ -224,6 +224,7 @@ def should_poll(self):
         return not (self.hass.data[DATA_ALEXAMEDIA]
                     ['accounts'][self._account]['websocket'])
 
+    @_catch_login_errors
     async def async_update(self):
         """Update state."""
         try: