diff --git a/Lieb/Data/DiscordService.cs b/Lieb/Data/DiscordService.cs
index 78106bc..39ff6b5 100644
--- a/Lieb/Data/DiscordService.cs
+++ b/Lieb/Data/DiscordService.cs
@@ -28,9 +28,9 @@ namespace Lieb.Data
         public DiscordSettings GetDiscordSettings(ulong discordServerId)
         {
             using var context = _contextFactory.CreateDbContext();
-            return context.DiscordSettings
-                .ToList()
-                .FirstOrDefault(s => s.DiscordSettingsId == discordServerId, new DiscordSettings());
+            DiscordSettings settings = context.DiscordSettings
+                .FirstOrDefault(s => s.DiscordSettingsId == discordServerId);
+            return settings != null ? settings : new DiscordSettings();
         }
 
         public async Task AddOrEditDiscordSettings(DiscordSettings discordSettings)
diff --git a/Lieb/Data/UserService.cs b/Lieb/Data/UserService.cs
index abbe901..579c5ee 100644
--- a/Lieb/Data/UserService.cs
+++ b/Lieb/Data/UserService.cs
@@ -66,7 +66,7 @@ namespace Lieb.Data
                 using var context = _contextFactory.CreateDbContext();
                 LiebUser user = context.LiebUsers
                     .Include(u => u.GuildWars2Accounts)
-                    .FirstOrDefault(u => u.Id == userId, new LiebUser());
+                    .FirstOrDefault(u => u.Id == userId);
 
                 if(user == null) return new GuildWars2Account();