diff --git a/lib/diaspora/guid.rb b/lib/diaspora/guid.rb
index 7ea870152..aa8ae8d81 100644
--- a/lib/diaspora/guid.rb
+++ b/lib/diaspora/guid.rb
@@ -9,6 +9,6 @@ module Diaspora::Guid
 
   # @return [String] The model's guid.
   def set_guid
-    self.guid ||= ActiveSupport::SecureRandom.hex(8)
+    self.guid = ActiveSupport::SecureRandom.hex(8) if self.guid.blank?
   end
 end