diff --git a/homeassistant/components/zha/core/gateway.py b/homeassistant/components/zha/core/gateway.py
index 14a6a5c839e..21f2f636128 100644
--- a/homeassistant/components/zha/core/gateway.py
+++ b/homeassistant/components/zha/core/gateway.py
@@ -474,7 +474,6 @@ class ZHAGateway:
         """Update the devices in the store."""
         for device in self.devices.values():
             self.zha_storage.async_update_device(device)
-        await self.zha_storage.async_save()
 
     async def async_device_initialized(self, device: zha_typing.ZigpyDeviceType):
         """Handle device joined and basic information discovered (async)."""
diff --git a/tests/ignore_uncaught_exceptions.py b/tests/ignore_uncaught_exceptions.py
index b0feb2bddb3..58531b251e0 100644
--- a/tests/ignore_uncaught_exceptions.py
+++ b/tests/ignore_uncaught_exceptions.py
@@ -121,35 +121,6 @@ IGNORE_UNCAUGHT_EXCEPTIONS = [
     ("tests.components.yr.test_sensor", "test_default_setup"),
     ("tests.components.yr.test_sensor", "test_custom_setup"),
     ("tests.components.yr.test_sensor", "test_forecast_setup"),
-    ("tests.components.zha.test_api", "test_device_clusters"),
-    ("tests.components.zha.test_api", "test_device_cluster_attributes"),
-    ("tests.components.zha.test_api", "test_device_cluster_commands"),
-    ("tests.components.zha.test_api", "test_list_devices"),
-    ("tests.components.zha.test_api", "test_device_not_found"),
-    ("tests.components.zha.test_api", "test_list_groups"),
-    ("tests.components.zha.test_api", "test_get_group"),
-    ("tests.components.zha.test_api", "test_get_group_not_found"),
-    ("tests.components.zha.test_api", "test_list_groupable_devices"),
-    ("tests.components.zha.test_api", "test_add_group"),
-    ("tests.components.zha.test_api", "test_remove_group"),
-    ("tests.components.zha.test_binary_sensor", "test_binary_sensor"),
-    ("tests.components.zha.test_cover", "test_cover"),
-    ("tests.components.zha.test_device_action", "test_get_actions"),
-    ("tests.components.zha.test_device_action", "test_action"),
-    ("tests.components.zha.test_device_tracker", "test_device_tracker"),
-    ("tests.components.zha.test_device_trigger", "test_triggers"),
-    ("tests.components.zha.test_device_trigger", "test_no_triggers"),
-    ("tests.components.zha.test_device_trigger", "test_if_fires_on_event"),
-    ("tests.components.zha.test_device_trigger", "test_exception_no_triggers"),
-    ("tests.components.zha.test_device_trigger", "test_exception_bad_trigger"),
-    ("tests.components.zha.test_discover", "test_devices"),
-    ("tests.components.zha.test_discover", "test_device_override"),
-    ("tests.components.zha.test_fan", "test_fan"),
-    ("tests.components.zha.test_gateway", "test_gateway_group_methods"),
-    ("tests.components.zha.test_light", "test_light"),
-    ("tests.components.zha.test_lock", "test_lock"),
-    ("tests.components.zha.test_sensor", "test_sensor"),
-    ("tests.components.zha.test_switch", "test_switch"),
     ("tests.components.zwave.test_init", "test_power_schemes"),
     (
         "tests.helpers.test_entity_platform",