diff --git a/contrib/storage-http/pom.xml b/contrib/storage-http/pom.xml
index d49e2ab7d19..9796978992a 100644
--- a/contrib/storage-http/pom.xml
+++ b/contrib/storage-http/pom.xml
@@ -31,7 +31,7 @@
   <name>Drill : Contrib : Storage : HTTP</name>
 
   <properties>
-    <okhttp.version>4.9.3</okhttp.version>
+    <okhttp.version>4.12.0</okhttp.version>
   </properties>
 
   <dependencies>
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java
index eed3c2384b9..2f30c6d428d 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java
+++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java
@@ -73,11 +73,8 @@ public String next() {
       throw new NoSuchElementException();
     }
 
-    builder.removeAllEncodedQueryParameters(offsetParam);
-    builder.removeAllEncodedQueryParameters(limitParam);
-
-    builder.addQueryParameter(offsetParam, String.valueOf(offset));
-    builder.addQueryParameter(limitParam, String.valueOf(pageSize));
+    builder.setEncodedQueryParameter(offsetParam, String.valueOf(offset));
+    builder.setEncodedQueryParameter(limitParam, String.valueOf(pageSize));
     offset += pageSize;
 
     return builder.build().url().toString();