diff --git a/app/models/direct_upload.rb b/app/models/direct_upload.rb
index cbd98f3d2..85d397706 100644
--- a/app/models/direct_upload.rb
+++ b/app/models/direct_upload.rb
@@ -19,7 +19,9 @@ class DirectUpload
     if @resource_type.present? && @resource_relation.present? && (@attachment.present? || @cached_attachment.present?)
       @resource = @resource_type.constantize.find_or_initialize_by(id: @resource_id)
 
-      if @resource.respond_to?(:images) && !@attachment.content_type.match(/pdf/)
+      #Refactor
+      if @resource.respond_to?(:images) &&
+        (@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present?
         @relation = @resource.images.send("build", relation_attributtes)
       elsif @resource.class.reflections[@resource_relation].macro == :has_one
         @relation = @resource.send("build_#{resource_relation}", relation_attributtes)
diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb
index bd519a5bb..1eef9a269 100644
--- a/spec/shared/features/nested_imageable.rb
+++ b/spec/shared/features/nested_imageable.rb
@@ -146,7 +146,11 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p
       send(fill_resource_method_name) if fill_resource_method_name
       click_on submit_button
 
-      expect(page).to have_content imageable_success_notice
+      if has_many_images
+         skip "no need to test, there are no attributes for the parent resource"
+      else
+        expect(page).to have_content imageable_success_notice
+      end
     end
 
     scenario "Should show successful notice when resource filled correctly and after valid file uploads", :js do