diff --git a/server/entity/Media.ts b/server/entity/Media.ts
index 8eca4fa70..761dfb3cd 100644
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -43,6 +43,10 @@ class Media {
         finalIds = tmdbIds;
       }
 
+      if (finalIds.length === 0) {
+        return [];
+      }
+
       const media = await mediaRepository
         .createQueryBuilder('media')
         .leftJoinAndSelect(
diff --git a/server/routes/user/index.ts b/server/routes/user/index.ts
index 2a29c0374..372218e7f 100644
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -45,7 +45,7 @@ router.get('/', async (req, res, next) => {
           `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
              CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
                CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
-                 user.email
+                 "user"."email"
                ELSE
                  LOWER(user.jellyfinUsername)
                END)