diff --git a/homeassistant/components/tibber/diagnostics.py b/homeassistant/components/tibber/diagnostics.py
index d9e04502509..75c76636f5f 100644
--- a/homeassistant/components/tibber/diagnostics.py
+++ b/homeassistant/components/tibber/diagnostics.py
@@ -17,15 +17,17 @@ async def async_get_config_entry_diagnostics(
 
     diagnostics_data = {}
 
-    homes = {}
+    homes = []
     for home in tibber_connection.get_homes(only_active=False):
-        homes[home.home_id] = {
-            "last_data_timestamp": home.last_data_timestamp,
-            "has_active_subscription": home.has_active_subscription,
-            "has_real_time_consumption": home.has_real_time_consumption,
-            "last_cons_data_timestamp": home.last_cons_data_timestamp,
-            "country": home.country,
-        }
+        homes.append(
+            {
+                "last_data_timestamp": home.last_data_timestamp,
+                "has_active_subscription": home.has_active_subscription,
+                "has_real_time_consumption": home.has_real_time_consumption,
+                "last_cons_data_timestamp": home.last_cons_data_timestamp,
+                "country": home.country,
+            }
+        )
     diagnostics_data["homes"] = homes
 
     return diagnostics_data
diff --git a/tests/components/tibber/test_diagnostics.py b/tests/components/tibber/test_diagnostics.py
index 38b5eb91a2f..78c0b6e321f 100644
--- a/tests/components/tibber/test_diagnostics.py
+++ b/tests/components/tibber/test_diagnostics.py
@@ -25,7 +25,7 @@ async def test_entry_diagnostics(recorder_mock, hass, hass_client, config_entry)
         result = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
 
     assert result == {
-        "homes": {},
+        "homes": [],
     }
 
     with patch(
@@ -35,13 +35,13 @@ async def test_entry_diagnostics(recorder_mock, hass, hass_client, config_entry)
         result = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
 
     assert result == {
-        "homes": {
-            "home_id": {
+        "homes": [
+            {
                 "last_data_timestamp": "2016-01-01T12:48:57",
                 "has_active_subscription": True,
                 "has_real_time_consumption": False,
                 "last_cons_data_timestamp": "2016-01-01T12:44:57",
                 "country": "NO",
             }
-        },
+        ],
     }