diff --git a/custom_components/tesla_custom/sensor.py b/custom_components/tesla_custom/sensor.py
index ffae5b3f..65e511ad 100644
--- a/custom_components/tesla_custom/sensor.py
+++ b/custom_components/tesla_custom/sensor.py
@@ -706,9 +706,9 @@ def extra_state_attributes(self):
             "Energy at arrival": self._car.active_route_energy_at_arrival,
             "Minutes traffic delay": minutes,
             "Destination": self._car.active_route_destination,
-            "Minutes to arrival": round(
-                float(self._car.active_route_minutes_to_arrival), 2
-            ),
+            "Minutes to arrival": None
+            if self._car.active_route_minutes_to_arrival is None
+            else round(float(self._car.active_route_minutes_to_arrival), 2),
         }
 
 
diff --git a/tests/test_sensor.py b/tests/test_sensor.py
index c956d015..9405dc6f 100644
--- a/tests/test_sensor.py
+++ b/tests/test_sensor.py
@@ -626,6 +626,14 @@ async def test_arrival_time(hass: HomeAssistant, monkeypatch: MonkeyPatch) -> No
     )
 
 
+async def test_arrival_time_none(hass: HomeAssistant, monkeypatch: MonkeyPatch) -> None:
+    """Tests arrival time is getting the correct value."""
+    car_mock_data.VEHICLE_DATA["drive_state"]["active_route_minutes_to_arrival"] = None
+    await setup_platform(hass, SENSOR_DOMAIN)
+    state = hass.states.get("sensor.my_model_s_arrival_time")
+    assert state.attributes.get("Minutes to arrival") == None
+
+
 async def test_distance_to_arrival(hass: HomeAssistant) -> None:
     """Tests distance to arrival is getting the correct value."""
     await setup_platform(hass, SENSOR_DOMAIN)