diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index aa385848997..7428879d91e 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -129,7 +129,7 @@ module FileStore
         S3Inventory.new(s3_helper, :upload).backfill_etags_and_list_missing
         S3Inventory.new(s3_helper, :optimized).backfill_etags_and_list_missing unless skip_optimized
       else
-        list_missing(Upload, "original/")
+        list_missing(Upload.by_users, "original/")
         list_missing(OptimizedImage, "optimized/") unless skip_optimized
       end
     end
diff --git a/lib/s3_inventory.rb b/lib/s3_inventory.rb
index 2231d78e90a..e0c8aed0cb5 100644
--- a/lib/s3_inventory.rb
+++ b/lib/s3_inventory.rb
@@ -54,7 +54,7 @@ class S3Inventory
             WHERE #{model.table_name}.etag IS NULL
               AND url ILIKE '%' || #{table_name}.key")
 
-          uploads = (model == Upload) ? model.where("created_at < ?", inventory_date) : model
+          uploads = (model == Upload) ? model.by_users.where("created_at < ?", inventory_date) : model
           missing_uploads = uploads.joins("LEFT JOIN #{table_name} ON #{table_name}.etag = #{model.table_name}.etag").where("#{table_name}.etag is NULL")
 
           if (missing_count = missing_uploads.count) > 0
diff --git a/spec/components/s3_inventory_spec.rb b/spec/components/s3_inventory_spec.rb
index 1a6d9e5ee70..3f81fb677c8 100644
--- a/spec/components/s3_inventory_spec.rb
+++ b/spec/components/s3_inventory_spec.rb
@@ -61,6 +61,7 @@ describe "S3Inventory" do
     CSV.foreach(csv_filename, headers: false) do |row|
       Fabricate(:upload, etag: row[S3Inventory::CSV_ETAG_INDEX], created_at: 2.days.ago)
     end
+
     upload = Fabricate(:upload, etag: "ETag", created_at: 1.days.ago)
     Fabricate(:upload, etag: "ETag2", created_at: Time.now)
 
@@ -91,6 +92,6 @@ describe "S3Inventory" do
       expect { inventory.backfill_etags_and_list_missing }.to change { Upload.where(etag: nil).count }.by(-2)
     end
 
-    expect(Upload.order(:url).pluck(:url, :etag)).to eq(files)
+    expect(Upload.by_users.order(:url).pluck(:url, :etag)).to eq(files)
   end
 end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 650b245fcb5..cae84db2f4c 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -274,7 +274,7 @@ describe ApplicationHelper do
         ).to include("some-image.png")
 
         expect(helper.crawlable_meta_data).to include(
-          SiteSetting.opengraph_image_url
+          SiteSetting.site_opengraph_image_url
         )
 
         SiteSetting.opengraph_image = nil