diff --git a/lib/diaspora/camo.rb b/lib/diaspora/camo.rb
index 6338b9076..51ee17d33 100644
--- a/lib/diaspora/camo.rb
+++ b/lib/diaspora/camo.rb
@@ -2,6 +2,7 @@
 module Diaspora
   module Camo
     def self.from_markdown(markdown_text)
+      return unless markdown_text
       markdown_text.gsub(/(!\[(.*?)\]\s?\([ \t]*()<?(\S+?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/m) do |link|
         link.gsub($4, self.image_url($4))
       end