diff --git a/provider/mqtt/client.go b/provider/mqtt/client.go
index 42c3abb7f..ca7f02c50 100644
--- a/provider/mqtt/client.go
+++ b/provider/mqtt/client.go
@@ -137,7 +137,7 @@ func (m *Client) Cleanup(topic string, retained bool) error {
 
 	time.Sleep(time.Second)
 
-	if !m.Client.Unsubscribe(topic).WaitTimeout(request.Timeout) {
+	if !m.Client.Unsubscribe(topic + "/#").WaitTimeout(request.Timeout) {
 		return api.ErrTimeout
 	}