diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
index a9d3e0f62..b42d46640 100644
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@@ -2,7 +2,7 @@ module Diaspora
   module UserModules
     module Receiving
       def receive_salmon salmon_xml
-        salmon = Salmon::SalmonSlap.parse(CGI::unescape salmon_xml, self)
+        salmon = Salmon::SalmonSlap.parse(CGI::unescape(salmon_xml), self)
         if salmon.verified_for_key?(salmon.author.public_key)
           Rails.logger.info("data in salmon: #{salmon.parsed_data}")
           self.receive(salmon.parsed_data)