diff --git a/src/libs/plugins/backends/aqhbci/banking/provider_tan.c b/src/libs/plugins/backends/aqhbci/banking/provider_tan.c
index 767714e..ccb9c97 100644
--- a/src/libs/plugins/backends/aqhbci/banking/provider_tan.c
+++ b/src/libs/plugins/backends/aqhbci/banking/provider_tan.c
@@ -81,6 +81,14 @@ int AH_Provider_InputTanWithChallenge(AB_PROVIDER *pro,
     return rv;
   }
 
+  /* Workaround for BNP Paribas/Consorsbank */
+  if (AH_TanMechanism_GetTanMethodId(tanMechanism) == AB_BANKING_TANMETHOD_PHOTOTAN &&
+      GWEN_Buffer_GetUsedBytes(bufChallenge)       == 0) {
+    /* if photoTAN is selected but there is no challenge image switch back to text method */
+    AH_TanMechanism_free(tanMechanism);
+    tanMechanism=AH_TanMechanism_Factory(tanMethodDescription, AB_BANKING_TANMETHOD_TEXT);
+  }
+
   rv=AH_TanMechanism_GetTan(tanMechanism,
                             u,
                             I18N("TAN Entry"),