diff --git a/src/server/loaders.js b/src/server/loaders.js
index 8c0ee17..a9872d8 100644
--- a/src/server/loaders.js
+++ b/src/server/loaders.js
@@ -355,7 +355,7 @@ const buildPetStatesForPetTypeLoader = (db, loaders) =>
     const [rows, _] = await db.execute(
       `SELECT * FROM pet_states
        WHERE pet_type_id IN (${qs})
-       ORDER BY mood_id ASC, female DESC, id DESC`,
+       ORDER BY (mood_id IS NULL) ASC, mood_id ASC, female DESC, id DESC`,
       petTypeIds
     );