diff --git a/app/uploaders/picture_uploader.rb b/app/uploaders/picture_uploader.rb
index 171c2d23..39b81f3f 100644
--- a/app/uploaders/picture_uploader.rb
+++ b/app/uploaders/picture_uploader.rb
@@ -8,6 +8,10 @@ class PictureUploader < CarrierWave::Uploader::Base
   # use cloudinary if it's configured
   if Cloudinary.config.cloud_name
     include Cloudinary::CarrierWave
+
+    def public_id
+      return model.try(:photo_file_name) || model.try(:logo_file_name)
+    end
   end
 
   def paperclip_path