diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 6b1320d84..75dd1a6f5 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -606,6 +606,7 @@ class DBRomsHandler(DBBaseHandler):
                 .with_only_columns(
                     base_subquery.c.id,
                     base_subquery.c.fs_name_no_ext,
+                    base_subquery.c.fs_name_no_tags,
                     base_subquery.c.platform_id,
                     base_subquery.c.igdb_id,
                     base_subquery.c.ss_id,
@@ -666,6 +667,11 @@ class DBRomsHandler(DBBaseHandler):
                                 base_subquery.c.flashpoint_id,
                                 base_subquery.c.platform_id,
                             ),
+                            _create_metadata_id_case(
+                                "fs",
+                                base_subquery.c.fs_name_no_tags,
+                                base_subquery.c.platform_id,
+                            ),
                             _create_metadata_id_case(
                                 "romm",
                                 base_subquery.c.id,