diff --git a/app/models/log.rb b/app/models/log.rb
index 45f638c56..cf985cc7b 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -38,7 +38,7 @@ class Log < ApplicationRecord
   }
   scope :filter_by_postcode, ->(postcode_full) { where("REPLACE(postcode_full, ' ', '') ILIKE ?", "%#{postcode_full.delete(' ')}%") }
   scope :filter_by_id, ->(id) { where(id:) }
-  scope :filter_by_user, ->(selected_user, _user = nil) { where(created_by: selected_user) }
+  scope :filter_by_user, ->(selected_user, _user = nil) { selected_user.present? ? where(created_by: selected_user) : all }
   scope :filter_by_bulk_upload_id, lambda { |bulk_upload_id, user|
     joins(:bulk_upload)
       .where(bulk_upload: { id: bulk_upload_id, user: })
diff --git a/spec/helpers/log_list_helper_spec.rb b/spec/helpers/log_list_helper_spec.rb
index 22836ec45..6f0bf22d7 100644
--- a/spec/helpers/log_list_helper_spec.rb
+++ b/spec/helpers/log_list_helper_spec.rb
@@ -16,22 +16,22 @@ RSpec.describe LogListHelper, type: :helper do
         expect(result).to be false
       end
 
-      it "returns true if the user filter is set to 'yours'" do
-        allow(self).to receive(:filter_selected?).with("user", "yours", filter_type).and_return true
+      it "returns true if the assigned to filter is set to you" do
+        allow(self).to receive(:filter_selected?).with("assigned_to", "you", filter_type).and_return true
         expect(result).to be true
       end
 
       it "returns false if any filters other than the user filter are set" do
         allow(self).to receive(:filter_selected?).and_return true
-        allow(self).to receive(:filter_selected?).with("user", "yours", filter_type).and_return false
+        allow(self).to receive(:filter_selected?).with("assigned_to", "you", filter_type).and_return false
         expect(result).to be false
       end
 
       context "when there is a search term present" do
         let(:search_term) { "word" }
 
-        it "still returns false as long as the user filter is not set to yours" do
-          allow(self).to receive(:filter_selected?).with("user", "yours", filter_type).and_return false
+        it "still returns false as long as the assigned to filter is not set to you" do
+          allow(self).to receive(:filter_selected?).with("assigned_to", "you", filter_type).and_return false
           expect(result).to be false
         end
       end