diff --git a/src/mqtt.py b/src/mqtt.py
index 4c2ae89..0ee1699 100644
--- a/src/mqtt.py
+++ b/src/mqtt.py
@@ -133,6 +133,7 @@ def on_message(client, userdata, msg):
     if msg.topic == otp_mqtt_topic:
         global otp_code
         otp_code = payload
+        set_otp_state()
         return None
     else:
         try:
diff --git a/src/volvo.py b/src/volvo.py
index 0d21dd8..916800c 100644
--- a/src/volvo.py
+++ b/src/volvo.py
@@ -156,7 +156,6 @@ def send_otp(auth_session, data):
     if not mqtt.otp_code:
         raise Exception ("No OTP found, exting...")
 
-    mqtt.set_otp_state()
     auth = auth_session.post(next_url, data=json.dumps(body))
     if auth.status_code == 200:
         return auth.json()