diff --git a/SurveyLib.Infrastructure.EFCore/Repositories/CompletionRepository.cs b/SurveyLib.Infrastructure.EFCore/Repositories/CompletionRepository.cs
index bef9e48..9442973 100644
--- a/SurveyLib.Infrastructure.EFCore/Repositories/CompletionRepository.cs
+++ b/SurveyLib.Infrastructure.EFCore/Repositories/CompletionRepository.cs
@@ -16,7 +16,7 @@ public class CompletionRepository : ICompletionRepository
 
     public async Task<Completion?> GetByIdAsync(int id)
     {
-        return await _context.Completions.FirstOrDefaultAsync(c => c.Id == id);
+        return await _context.Completions.FindAsync(id);
     }
 
     public async Task<IEnumerable<Completion>> GetAllAsync()
diff --git a/SurveyLib.Infrastructure.EFCore/Repositories/QuestionRepository.cs b/SurveyLib.Infrastructure.EFCore/Repositories/QuestionRepository.cs
index d124a8e..8145f97 100644
--- a/SurveyLib.Infrastructure.EFCore/Repositories/QuestionRepository.cs
+++ b/SurveyLib.Infrastructure.EFCore/Repositories/QuestionRepository.cs
@@ -16,7 +16,7 @@ public class QuestionRepository : IQuestionRepository
 
     public async Task<QuestionBase?> GetByIdAsync(int id)
     {
-        return await _context.Questions.FirstOrDefaultAsync(q => q.Id == id);
+        return await _context.Questions.FindAsync(id);
     }
 
     public async Task<IEnumerable<QuestionBase>> GetAllAsync()
diff --git a/SurveyLib.Infrastructure.EFCore/Repositories/SurveyRepository.cs b/SurveyLib.Infrastructure.EFCore/Repositories/SurveyRepository.cs
index b655a9e..afe6ca8 100644
--- a/SurveyLib.Infrastructure.EFCore/Repositories/SurveyRepository.cs
+++ b/SurveyLib.Infrastructure.EFCore/Repositories/SurveyRepository.cs
@@ -16,7 +16,7 @@ public class SurveyRepository : ISurveyRepository
 
     public async Task<Survey?> GetByIdAsync(int id)
     {
-        return await _context.Surveys.FirstOrDefaultAsync(s => s.Id == id);
+        return await _context.Surveys.FindAsync(id);
     }
 
     public async Task<IEnumerable<Survey>> GetAllAsync()