diff --git a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt b/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt
index cb030b3f..cab8c649 100644
--- a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt
+++ b/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt
@@ -195,7 +195,7 @@ open class FinTsClient(
             }
             else {
                 didOverwriteUserUnselectedTanProcedure = true
-                customer.selectedTanProcedure = customer.supportedTanProcedures.first()
+                customer.selectedTanProcedure = selectSuggestedTanProcedure(customer) ?: customer.supportedTanProcedures.first()
             }
         }