diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 3948a0645..de1002604 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -362,7 +362,6 @@ class EppController < ApplicationController
       frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]</')
     end
     trimmed_request = frame.gsub(/<eis:legalDocument([^>]+)>([^<])+<\/eis:legalDocument>/, "<eis:legalDocument>[FILTERED]</eis:legalDocument>") if frame.present?
-    trimmed_request.gsub(/\s+</, "<").gsub(/>\s+/, ">")
 
     ApiLog::EppLog.create({
       request: trimmed_request,
diff --git a/lib/epp_constraint.rb b/lib/epp_constraint.rb
index 06cf3d45a..9cd68c121 100644
--- a/lib/epp_constraint.rb
+++ b/lib/epp_constraint.rb
@@ -11,6 +11,7 @@ class EppConstraint
   # creates parsed_frame, detects epp request object
   def matches?(request)
     # TODO: Maybe move this to controller to keep params clean
+    request.params[:raw_frame] = request.params[:raw_frame].gsub!(/(?<=>)(.*?)(?=<)/) { |s| s.strip}
     request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame])
     request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces!