diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
index c8918d1c4..34324a505 100644
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@@ -44,10 +44,10 @@ class CompareController < ApplicationController
   def load_compare_params
     @base = Addressable::URI.unescape(params[:base])
     @head = params[:head].include?('.json') ? params[:head][0..-6] : params[:head]
-
+    @head = Addressable::URI.unescape(@head)
   end
 
   def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head, current_user.gitea_token)
+    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, CGI.escape(base), CGI.escape(head), current_user.gitea_token)
   end
 end