diff --git a/homeassistant/components/sensor/swiss_public_transport.py b/homeassistant/components/sensor/swiss_public_transport.py
index bd12cb84cf9..c48194d6eee 100644
--- a/homeassistant/components/sensor/swiss_public_transport.py
+++ b/homeassistant/components/sensor/swiss_public_transport.py
@@ -109,7 +109,7 @@ class SwissPublicTransportSensor(Entity):
         """ Gets the latest data from opendata.ch and updates the states. """
         times = self.data.update()
         if times is not None:
-            self._state = times[0] + ', ' + times[1]
+            self._state = ', '.join(times)
 
 
 # pylint: disable=too-few-public-methods