diff --git a/src/main/java/org/apache/iceberg/rest/RESTServerCatalogAdapter.java b/src/main/java/org/apache/iceberg/rest/RESTServerCatalogAdapter.java
index 32761d1..ac6bba4 100644
--- a/src/main/java/org/apache/iceberg/rest/RESTServerCatalogAdapter.java
+++ b/src/main/java/org/apache/iceberg/rest/RESTServerCatalogAdapter.java
@@ -26,9 +26,7 @@ public RESTServerCatalogAdapter(CatalogContext catalogContext) {
     public <T extends RESTResponse> T handleRequest(Route route, Map<String, String> vars, Object body, Class<T> responseType) {
         T restResponse = super.handleRequest(route, vars, body, responseType);
 
-        if (route == Route.LOAD_TABLE) {
-            LoadTableResponse loadTableResponse = (LoadTableResponse) restResponse;
-
+        if (restResponse instanceof LoadTableResponse loadTableResponse) {
             if (PropertyUtil.propertyAsBoolean(catalogContext.configuration(), INCLUDE_CREDENTIALS, false)) {
                 applyCredentials(catalogContext.configuration(), loadTableResponse.config());
             }