diff --git a/tests/components/zha/conftest.py b/tests/components/zha/conftest.py
index 9d9d74e72df..a4ff5a3b205 100644
--- a/tests/components/zha/conftest.py
+++ b/tests/components/zha/conftest.py
@@ -26,7 +26,9 @@ import zigpy.zdo.types as zdo_t
 import homeassistant.components.zha.core.const as zha_const
 import homeassistant.components.zha.core.device as zha_core_device
 from homeassistant.components.zha.core.helpers import get_zha_gateway
+from homeassistant.helpers import restore_state
 from homeassistant.setup import async_setup_component
+import homeassistant.util.dt as dt_util
 
 from .common import patch_cluster as common_patch_cluster
 
@@ -498,3 +500,35 @@ def network_backup() -> zigpy.backups.NetworkBackup:
             },
         }
     )
+
+
+@pytest.fixture
+def core_rs(hass_storage):
+    """Core.restore_state fixture."""
+
+    def _storage(entity_id, state, attributes={}):
+        now = dt_util.utcnow().isoformat()
+
+        hass_storage[restore_state.STORAGE_KEY] = {
+            "version": restore_state.STORAGE_VERSION,
+            "key": restore_state.STORAGE_KEY,
+            "data": [
+                {
+                    "state": {
+                        "entity_id": entity_id,
+                        "state": str(state),
+                        "attributes": attributes,
+                        "last_changed": now,
+                        "last_updated": now,
+                        "context": {
+                            "id": "3c2243ff5f30447eb12e7348cfd5b8ff",
+                            "user_id": None,
+                        },
+                    },
+                    "last_seen": now,
+                }
+            ],
+        }
+        return
+
+    return _storage
diff --git a/tests/components/zha/test_binary_sensor.py b/tests/components/zha/test_binary_sensor.py
index b41499dada7..5dd7a5653ec 100644
--- a/tests/components/zha/test_binary_sensor.py
+++ b/tests/components/zha/test_binary_sensor.py
@@ -9,8 +9,6 @@ import zigpy.zcl.clusters.security as security
 
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import restore_state
-from homeassistant.util import dt as dt_util
 
 from .common import (
     async_enable_traffic,
@@ -152,38 +150,6 @@ async def test_binary_sensor(
     assert hass.states.get(entity_id).state == STATE_OFF
 
 
-@pytest.fixture
-def core_rs(hass_storage):
-    """Core.restore_state fixture."""
-
-    def _storage(entity_id, attributes, state):
-        now = dt_util.utcnow().isoformat()
-
-        hass_storage[restore_state.STORAGE_KEY] = {
-            "version": restore_state.STORAGE_VERSION,
-            "key": restore_state.STORAGE_KEY,
-            "data": [
-                {
-                    "state": {
-                        "entity_id": entity_id,
-                        "state": str(state),
-                        "attributes": attributes,
-                        "last_changed": now,
-                        "last_updated": now,
-                        "context": {
-                            "id": "3c2243ff5f30447eb12e7348cfd5b8ff",
-                            "user_id": None,
-                        },
-                    },
-                    "last_seen": now,
-                }
-            ],
-        }
-        return
-
-    return _storage
-
-
 @pytest.mark.parametrize(
     "restored_state",
     [
diff --git a/tests/components/zha/test_light.py b/tests/components/zha/test_light.py
index 1ec70b74735..bd799187a19 100644
--- a/tests/components/zha/test_light.py
+++ b/tests/components/zha/test_light.py
@@ -40,7 +40,10 @@ from .common import (
 )
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
 
-from tests.common import async_fire_time_changed
+from tests.common import (
+    async_fire_time_changed,
+    async_mock_load_restore_state_from_storage,
+)
 
 IEEE_GROUPABLE_DEVICE = "01:2d:6f:00:0a:90:69:e8"
 IEEE_GROUPABLE_DEVICE2 = "02:2d:6f:00:0a:90:69:e9"
@@ -1921,3 +1924,76 @@ async def test_group_member_assume_state(
         await zha_gateway.async_remove_zigpy_group(zha_group.group_id)
         assert hass.states.get(group_entity_id) is None
         assert entity_registry.async_get(group_entity_id) is None
+
+
+@pytest.mark.parametrize(
+    ("restored_state", "expected_state"),
+    [
+        (
+            STATE_ON,
+            {
+                "brightness": None,
+                "off_with_transition": None,
+                "off_brightness": None,
+                "color_mode": ColorMode.XY,  # color_mode defaults to what the light supports when restored with ON state
+                "color_temp": None,
+                "xy_color": None,
+                "hs_color": None,
+                "effect": None,
+            },
+        ),
+        (
+            STATE_OFF,
+            {
+                "brightness": None,
+                "off_with_transition": None,
+                "off_brightness": None,
+                "color_mode": None,
+                "color_temp": None,
+                "xy_color": None,
+                "hs_color": None,
+                "effect": None,
+            },
+        ),
+    ],
+)
+async def test_restore_light_state(
+    hass: HomeAssistant,
+    zigpy_device_mock,
+    core_rs,
+    zha_device_restored,
+    restored_state,
+    expected_state,
+) -> None:
+    """Test ZHA light restores without throwing an error when attributes are None."""
+
+    # restore state with None values
+    attributes = {
+        "brightness": None,
+        "off_with_transition": None,
+        "off_brightness": None,
+        "color_mode": None,
+        "color_temp": None,
+        "xy_color": None,
+        "hs_color": None,
+        "effect": None,
+    }
+
+    entity_id = "light.fakemanufacturer_fakemodel_light"
+    core_rs(
+        entity_id,
+        state=restored_state,
+        attributes=attributes,
+    )
+    await async_mock_load_restore_state_from_storage(hass)
+
+    zigpy_device = zigpy_device_mock(LIGHT_COLOR)
+    zha_device = await zha_device_restored(zigpy_device)
+    entity_id = find_entity_id(Platform.LIGHT, zha_device, hass)
+
+    assert entity_id is not None
+    assert hass.states.get(entity_id).state == restored_state
+
+    # compare actual restored state to expected state
+    for attribute, expected_value in expected_state.items():
+        assert hass.states.get(entity_id).attributes.get(attribute) == expected_value