diff --git a/privacyidea/api/validate.py b/privacyidea/api/validate.py
index 4434e8f3a4..942ae8032b 100644
--- a/privacyidea/api/validate.py
+++ b/privacyidea/api/validate.py
@@ -202,6 +202,7 @@ def offlinerefill():
 @postpolicy(is_authorized, request=request)
 @postpolicy(mangle_challenge_response, request=request)
 @postpolicy(construct_radius_response, request=request)
+@postpolicy(preferred_client_mode, request=request)
 @postpolicy(multichallenge_enroll_via_validate, request=request)
 @postpolicy(no_detail_on_fail, request=request)
 @postpolicy(no_detail_on_success, request=request)
@@ -211,7 +212,6 @@ def offlinerefill():
 @postpolicy(check_tokentype, request=request)
 @postpolicy(check_serial, request=request)
 @postpolicy(autoassign, request=request)
-@postpolicy(preferred_client_mode, request=request)
 @add_serial_from_response_to_g
 @prepolicy(check_application_tokentype, request=request)
 @prepolicy(pushtoken_wait, request=request)
diff --git a/privacyidea/lib/tokens/emailtoken.py b/privacyidea/lib/tokens/emailtoken.py
index 80a96b4635..c3ec0a0d13 100644
--- a/privacyidea/lib/tokens/emailtoken.py
+++ b/privacyidea/lib/tokens/emailtoken.py
@@ -542,7 +542,6 @@ def enroll_via_validate(cls, g, content, user_obj):
                 "type": token_obj.type,
                 "message": _("Please enter your new email address!")}
         detail["multi_challenge"] = [chal]
-        detail.update({"preferred_client_mode": CLIENTMODE.INTERACTIVE})
         detail.update(chal)
 
     def enroll_via_validate_2nd_step(self, passw, options=None):
diff --git a/privacyidea/lib/tokens/hotptoken.py b/privacyidea/lib/tokens/hotptoken.py
index 054fde9000..27144bf82c 100644
--- a/privacyidea/lib/tokens/hotptoken.py
+++ b/privacyidea/lib/tokens/hotptoken.py
@@ -841,7 +841,6 @@ def enroll_via_validate(cls, g, content, user_obj):
                 "type": token_obj.type,
                 "message": _("Please scan the QR code!")}
         detail["multi_challenge"] = [chal]
-        detail.update({"preferred_client_mode": CLIENTMODE.INTERACTIVE})
         detail.update(chal)
 
     def has_further_challenge(self, options=None):
diff --git a/privacyidea/lib/tokens/pushtoken.py b/privacyidea/lib/tokens/pushtoken.py
index c00aa0b6e9..b2cb68ae33 100644
--- a/privacyidea/lib/tokens/pushtoken.py
+++ b/privacyidea/lib/tokens/pushtoken.py
@@ -1057,5 +1057,4 @@ def enroll_via_validate(cls, g, content, user_obj):
                 "type": token_obj.type,
                 "message": _("Please scan the QR code!")}
         detail["multi_challenge"] = [chal]
-        detail.update({"preferred_client_mode": CLIENTMODE.POLL})
         detail.update(chal)
diff --git a/privacyidea/lib/tokens/smstoken.py b/privacyidea/lib/tokens/smstoken.py
index 792b90c583..0465e9ee28 100644
--- a/privacyidea/lib/tokens/smstoken.py
+++ b/privacyidea/lib/tokens/smstoken.py
@@ -602,7 +602,6 @@ def enroll_via_validate(cls, g, content, user_obj):
                 "type": token_obj.type,
                 "message": _("Please enter your new phone number!")}
         detail["multi_challenge"] = [chal]
-        detail.update({"preferred_client_mode": CLIENTMODE.INTERACTIVE})
         detail.update(chal)
 
     def enroll_via_validate_2nd_step(self, passw, options=None):