diff --git a/app/models/search/record/sqlite.rb b/app/models/search/record/sqlite.rb
index ae0d34281..857e858a7 100644
--- a/app/models/search/record/sqlite.rb
+++ b/app/models/search/record/sqlite.rb
@@ -10,7 +10,10 @@ module Search::Record::SQLite
 
     after_save :upsert_to_fts5_table
 
-    scope :matching, ->(query, account_id) { joins(:search_records_fts).where("search_records_fts MATCH ?", query) }
+    scope :matching, ->(query, account_id) {
+      joins("INNER JOIN search_records_fts ON search_records_fts.rowid = #{table_name}.id")
+        .where("search_records_fts MATCH ?", query)
+    }
   end
 
   class_methods do
diff --git a/test/models/filter/search_test.rb b/test/models/filter/search_test.rb
index cbdd9558d..8e3344114 100644
--- a/test/models/filter/search_test.rb
+++ b/test/models/filter/search_test.rb
@@ -12,4 +12,14 @@ class Filter::SearchTest < ActiveSupport::TestCase
 
     assert_equal [ card ], filter.cards.to_a
   end
+
+  test "multiple terms all match" do
+    matching_card = @board.cards.create!(title: "haggis neeps tatties", creator: @user, status: "published")
+    @board.cards.create!(title: "haggis only", creator: @user, status: "published")
+    @board.cards.create!(title: "neeps only", creator: @user, status: "published")
+
+    filter = @user.filters.new(terms: [ "haggis", "neeps" ], indexed_by: "all", sorted_by: "latest")
+
+    assert_equal [ matching_card ], filter.cards.to_a
+  end
 end