diff --git a/backend/handler/database/saves_handler.py b/backend/handler/database/saves_handler.py
index 773debdbf..b7f97be68 100644
--- a/backend/handler/database/saves_handler.py
+++ b/backend/handler/database/saves_handler.py
@@ -5,6 +5,7 @@ from sqlalchemy.orm import Session
 
 from decorators.database import begin_session
 from models.assets import Save
+from models.rom import Rom
 
 from .base_handler import DBBaseHandler
 
@@ -42,7 +43,9 @@ class DBSavesHandler(DBBaseHandler):
             query = query.filter_by(rom_id=rom_id)
 
         if platform_id:
-            query = query.filter_by(platform_id=platform_id)
+            query = query.join(Rom, Save.rom_id == Rom.id).filter(
+                Rom.platform_id == platform_id
+            )
 
         return session.scalars(query).all()
 
diff --git a/backend/handler/database/states_handler.py b/backend/handler/database/states_handler.py
index 8673443e4..5e7477dc6 100644
--- a/backend/handler/database/states_handler.py
+++ b/backend/handler/database/states_handler.py
@@ -5,6 +5,7 @@ from sqlalchemy.orm import Session
 
 from decorators.database import begin_session
 from models.assets import State
+from models.rom import Rom
 
 from .base_handler import DBBaseHandler
 
@@ -42,7 +43,9 @@ class DBStatesHandler(DBBaseHandler):
             query = query.filter_by(rom_id=rom_id)
 
         if platform_id:
-            query = query.filter_by(platform_id=platform_id)
+            query = query.join(Rom, State.rom_id == Rom.id).filter(
+                Rom.platform_id == platform_id
+            )
 
         return session.scalars(query).all()