diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb
index b703e1b4e..607e4ce29 100644
--- a/app/helpers/avatar_helper.rb
+++ b/app/helpers/avatar_helper.rb
@@ -15,9 +15,9 @@ module AvatarHelper
     if File.exist?(disk_filename(source&.class, source&.id))
       ctime = File.ctime(disk_filename(source.class, source.id)).to_i
       if %w(User Organization).include?(source.class.to_s)
-        File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+        File.join("images", relative_path, ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
       else
-        File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
+        File.join("images/avatars", ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
       end
     elsif source.class.to_s == 'User'
       source.get_letter_avatar_url