diff --git a/plugin/auth/oauth.go b/plugin/auth/oauth.go
index a64784a2e..1785459b2 100644
--- a/plugin/auth/oauth.go
+++ b/plugin/auth/oauth.go
@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"net/http"
 	"net/url"
 	"strings"
 	"sync"
@@ -111,7 +112,7 @@ func NewOauth(ctx context.Context, name, device string, oc *oauth2.Config, opts
 
 	log := util.NewLogger("oauth-" + hash)
 
-	if ctx.Value(oauth2.HTTPClient) == nil {
+	if client, ok := ctx.Value(oauth2.HTTPClient).(*http.Client); client == nil || !ok {
 		ctx = context.WithValue(ctx, oauth2.HTTPClient, request.NewClient(log))
 	}
 
diff --git a/vehicle/bmw/cardata/mqtt.go b/vehicle/bmw/cardata/mqtt.go
index 79b92139a..86f90266a 100644
--- a/vehicle/bmw/cardata/mqtt.go
+++ b/vehicle/bmw/cardata/mqtt.go
@@ -115,7 +115,7 @@ func (v *MqttConnector) runMqtt(ctx context.Context, token *oauth2.Token) error
 	}
 	defer paho.Disconnect(1000)
 
-	topic := fmt.Sprintf("%s/#", gcid)
+	topic := fmt.Sprintf("%s/+", gcid)
 
 	if t := paho.Subscribe(topic, 0, v.handler); !t.WaitTimeout(timeout) {
 		return errors.New("subcribe timeout")