diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 774b5528e..3f6fa7507 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -34,8 +34,8 @@ class UploadsController < ApplicationController
     case @mode
     when "table"
       @uploads = authorize Upload.visible(CurrentUser.user).paginated_search(params, count_pages: true)
-      @uploads = @uploads.includes(:uploader, media_assets: [:post]) if request.format.html?
-      respond_with(@uploads)
+      @uploads = @uploads.includes(:uploader, media_assets: :post, upload_media_assets: { media_asset: :post }) if request.format.html?
+      respond_with(@uploads, include: { upload_media_assets: { include: :media_asset }})
     when "gallery"
       @media_assets = authorize MediaAsset.active.visible(CurrentUser.user).includes(:post, uploads: [:uploader]).where(uploads: { uploader: CurrentUser.user }).paginated_search(params, count_pages: true).reorder("uploads.id DESC")
       respond_with(@media_assets)
@@ -57,7 +57,7 @@ class UploadsController < ApplicationController
       flash[:notice] = "Duplicate of post ##{@upload.media_assets.first.post.id}"
       redirect_to @upload.media_assets.first.post
     else
-      respond_with(@upload)
+      respond_with(@upload, include: { upload_media_assets: { include: :media_asset }})
     end
   end
 end