1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/helpers/pagination.rb b/lib/api/helpers/pagination.rb
index d00e61678b5..2a9b17ad22a 100644
--- a/lib/api/helpers/pagination.rb
+++ b/lib/api/helpers/pagination.rb
@@ -23,7 +23,7 @@ module API
         def base_request_uri
           @base_request_uri ||= URI.parse(request.url).tap do |uri|
             uri.host = Gitlab.config.gitlab.host
-            uri.port = nil
+            uri.port = Gitlab.config.gitlab.port
           end
         end
 
@@ -149,7 +149,7 @@ module API
         def conditions(pagination)
           fields = pagination.fields
 
-          return nil if fields.empty?
+          return if fields.empty?
 
           placeholder = fields.map { '?' }