diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb
index 4e1ec1402ea..86a36ce93d3 100644
--- a/lib/gitlab/url_sanitizer.rb
+++ b/lib/gitlab/url_sanitizer.rb
@@ -64,6 +64,8 @@ module Gitlab
       url.password = password if password.present?
       url.user = user if user.present?
       url
+    rescue Addressable::URI::InvalidURIError
+      Addressable::URI.new
     end
 
     def generate_full_url