diff --git a/app/models/application_model/assets.rb b/app/models/application_model/assets.rb
index f5bf4d5c0..9250740da 100644
--- a/app/models/application_model/assets.rb
+++ b/app/models/application_model/assets.rb
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
+#36 Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 # rubocop:disable ClassAndModuleChildren
 module ApplicationModel::Assets
 
@@ -32,7 +32,7 @@ returns
     return data if !self['created_by_id'] && !self['updated_by_id']
     %w(created_by_id updated_by_id).each {|local_user_id|
       next if !self[ local_user_id ]
-      next data[ User.to_app_model ] && data[ User.to_app_model ][ self[ local_user_id ] ]
+      next if data[ User.to_app_model ] && data[ User.to_app_model ][ self[ local_user_id ] ]
       user = User.lookup( id: self[ local_user_id ] )
       data = user.assets( data )
     }