diff --git a/client/trino-client/src/main/java/io/trino/client/auth/external/HttpTokenPoller.java b/client/trino-client/src/main/java/io/trino/client/auth/external/HttpTokenPoller.java
index 5e53dac531a8..8ff53bfed585 100644
--- a/client/trino-client/src/main/java/io/trino/client/auth/external/HttpTokenPoller.java
+++ b/client/trino-client/src/main/java/io/trino/client/auth/external/HttpTokenPoller.java
@@ -37,6 +37,7 @@
 import static io.trino.client.JsonCodec.jsonCodec;
 import static io.trino.client.JsonResponse.execute;
 import static java.lang.String.format;
+import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
 import static java.time.temporal.ChronoUnit.MILLIS;
@@ -96,7 +97,7 @@ public void tokenReceived(URI tokenUri)
                     .withMaxAttempts(-1)
                     .withMaxDuration(Duration.ofSeconds(4))
                     .withBackoff(100, 500, MILLIS)
-                    .handleResultIf(code -> code != HTTP_OK))
+                    .handleResultIf(code -> code >= HTTP_INTERNAL_ERROR))
                     .get(() -> {
                         Request request = prepareRequestBuilder(tokenUri)
                                 .delete()
diff --git a/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java b/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java
index 7d68edee911e..cc342201acc4 100644
--- a/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java
+++ b/client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java
@@ -176,20 +176,16 @@ public void testTokenReceived()
     }
 
     @Test
-    public void testTokenReceivedRetriesUntilHTTP_OK()
+    public void testTokenReceivedRetriesUntilNotErrorReturned()
     {
         server.enqueue(status(HTTP_UNAVAILABLE));
         server.enqueue(status(HTTP_UNAVAILABLE));
         server.enqueue(status(HTTP_UNAVAILABLE));
         server.enqueue(status(202));
-        server.enqueue(status(303));
-        server.enqueue(status(HTTP_OK));
-        server.enqueue(status(HTTP_OK));
-        server.enqueue(status(HTTP_OK));
 
         tokenPoller.tokenReceived(tokenUri());
 
-        assertThat(server.getRequestCount()).isEqualTo(6);
+        assertThat(server.getRequestCount()).isEqualTo(4);
     }
 
     @Test
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java
index 6adadcbb5a43..13ca2a931ba1 100644
--- a/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java
+++ b/core/trino-main/src/main/java/io/trino/server/security/oauth2/OAuth2TokenExchangeResource.java
@@ -114,13 +114,16 @@ private static Response pendingResponse(HttpServletRequest request)
     @ResourceSecurity(PUBLIC)
     @DELETE
     @Path("{authId}")
-    public void deleteAuthenticationToken(@PathParam("authId") UUID authId)
+    public Response deleteAuthenticationToken(@PathParam("authId") UUID authId)
     {
         if (authId == null) {
             throw new BadRequestException();
         }
 
         tokenExchange.dropToken(authId);
+        return Response
+                .ok()
+                .build();
     }
 
     public static String getTokenUri(UUID authId)