diff --git a/zilencer/views.py b/zilencer/views.py
index 89fc4c1079..a2df0c37fe 100644
--- a/zilencer/views.py
+++ b/zilencer/views.py
@@ -14,6 +14,7 @@ from zerver.lib.request import JsonableError
 from zerver.lib.response import json_error, json_success
 from zerver.lib.validator import check_dict
 from zerver.models import UserProfile, PushDeviceToken, Realm
+from zerver.views.push_notifications import validate_token
 
 from typing import Any, Dict, Optional, Union, Text, cast
 
@@ -22,11 +23,10 @@ def validate_entity(entity):
     if not isinstance(entity, RemoteZulipServer):
         raise JsonableError(_("Must validate with valid Zulip server API key"))
 
-def validate_bouncer_token_request(entity, token):
-    # type: (Union[UserProfile, RemoteZulipServer], Text) -> None
+def validate_bouncer_token_request(entity, token, kind):
+    # type: (Union[UserProfile, RemoteZulipServer], str, int) -> None
     validate_entity(entity)
-    if token == '' or len(token) > 4096:
-        raise JsonableError(_("Empty or invalid length token"))
+    validate_token(token, kind)
 
 @has_request_variables
 def report_error(request, deployment, type=REQ(), report=REQ(validator=check_dict([]))):
@@ -36,8 +36,8 @@ def report_error(request, deployment, type=REQ(), report=REQ(validator=check_dic
 @has_request_variables
 def remote_server_register_push(request, entity, user_id=REQ(),
                                 token=REQ(), token_kind=REQ(), ios_app_id=None):
-    # type: (HttpRequest, Union[UserProfile, RemoteZulipServer], int, Text, int, Optional[Text]) -> HttpResponse
-    validate_bouncer_token_request(entity, token)
+    # type: (HttpRequest, Union[UserProfile, RemoteZulipServer], int, str, int, Optional[Text]) -> HttpResponse
+    validate_bouncer_token_request(entity, token, token_kind)
     server = cast(RemoteZulipServer, entity)
 
     # If a user logged out on a device and failed to unregister,
@@ -61,8 +61,8 @@ def remote_server_register_push(request, entity, user_id=REQ(),
 @has_request_variables
 def remote_server_unregister_push(request, entity, token=REQ(),
                                   token_kind=REQ(), ios_app_id=None):
-    # type: (HttpRequest, Union[UserProfile, RemoteZulipServer], Text, int, Optional[Text]) -> HttpResponse
-    validate_bouncer_token_request(entity, token)
+    # type: (HttpRequest, Union[UserProfile, RemoteZulipServer], str, int, Optional[Text]) -> HttpResponse
+    validate_bouncer_token_request(entity, token, token_kind)
     server = cast(RemoteZulipServer, entity)
     deleted = RemotePushDeviceToken.objects.filter(token=token,
                                                    kind=token_kind,