diff --git a/src/main.c b/src/main.c
index aa87fec..5beaaec 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1556,7 +1556,7 @@ tokenDefinition_t* getKnownToken() {
     }
 #endif
 
-    if (currentTokenSet && (os_memcmp(tmpCtx.transactionContext.currentToken.address, tmpContent.txContent.destination, 20) == 0)) {      
+    if ((currentTokenSet || tokenProvisioned) && (os_memcmp(tmpCtx.transactionContext.currentToken.address, tmpContent.txContent.destination, 20) == 0)) {      
       currentTokenSet = false;
       return &tmpCtx.transactionContext.currentToken;
     }