diff --git a/pkg/mqtt/discovery.go b/pkg/mqtt/discovery.go
index 4d8782a..95fcc69 100644
--- a/pkg/mqtt/discovery.go
+++ b/pkg/mqtt/discovery.go
@@ -143,7 +143,7 @@ func (c *Client) publishSensorDiscoveryForSensor(sensor *datastore.Sensor) error
 		discovery := SensorDiscovery{
 			Platform:          "mqtt",
 			Name:              fmt.Sprintf("%s Temperature", sensor.Name),
-			StateTopic:        fmt.Sprintf("telldus/sensor/%s/%s/%d/temperature", sensor.Protocol, sensor.Model, sensor.ID),
+			StateTopic:        fmt.Sprintf("telldus/sensor/%d/temperature", sensor.ID),
 			UniqueID:          sensor.TemperatureUniqueID,
 			UnitOfMeasurement: "°C",
 			DeviceClass:       "temperature",
diff --git a/pkg/mqtt/mqtt.go b/pkg/mqtt/mqtt.go
index 465a193..b5418db 100644
--- a/pkg/mqtt/mqtt.go
+++ b/pkg/mqtt/mqtt.go
@@ -56,9 +56,9 @@ func (c *Client) PublishSensorValue(protocol, model string, id int, dataType int
 	var topic string
 	switch dataType {
 	case telldus.DataTypeTemperature:
-		topic = fmt.Sprintf("telldus/sensor/%s/%s/%d/temperature", protocol, model, id)
+		topic = fmt.Sprintf("telldus/sensor/%d/temperature", id)
 	case telldus.DataTypeHumidity:
-		topic = fmt.Sprintf("telldus/sensor/%s/%s/%d/humidity", protocol, model, id)
+		topic = fmt.Sprintf("telldus/sensor/%d/humidity", id)
 	default:
 		return
 	}