diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts
index 088ad623..1b353b28 100644
--- a/backend/src/data/questions/answer-repository.ts
+++ b/backend/src/data/questions/answer-repository.ts
@@ -20,7 +20,7 @@ export class AnswerRepository extends DwengoEntityRepository<Answer> {
             orderBy: { sequenceNumber: 'ASC' },
         });
     }
-    public async findAnswer(question: Question, sequenceNumber: number): Promise<Loaded<Answer, never, "*", never> | null> {
+    public async findAnswer(question: Question, sequenceNumber: number): Promise<Loaded<Answer> | null> {
         return this.findOne({
             toQuestion: question, sequenceNumber
         });
diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 18bcd551..27a4ac19 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -63,7 +63,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
         });
     }
 
-    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number): Promise<Loaded<Question, never, "*", never> | null> {
+    public async findByLearningObjectAndSequenceNumber(loId: LearningObjectIdentifier, sequenceNumber: number): Promise<Loaded<Question> | null> {
         return this.findOne({
             learningObjectHruid: loId.hruid,
             learningObjectLanguage: loId.language,
diff --git a/frontend/src/controllers/answers.ts b/frontend/src/controllers/answers.ts
index 60d623f8..b95f27db 100644
--- a/frontend/src/controllers/answers.ts
+++ b/frontend/src/controllers/answers.ts
@@ -26,7 +26,7 @@ export class AnswerController extends BaseController {
         return this.get<AnswerResponse>(`/${seq}`, {lang: this.loId.lang});
     }
 
-    async create(answerData: AnswerData) {
+    async create(answerData: AnswerData): Promise<AnswerResponse> {
         return this.post<AnswerResponse>("/", answerData, {lang: this.loId.lang});
     }
 
diff --git a/frontend/src/controllers/questions.ts b/frontend/src/controllers/questions.ts
index d190c30f..28609e95 100644
--- a/frontend/src/controllers/questions.ts
+++ b/frontend/src/controllers/questions.ts
@@ -28,11 +28,11 @@ export class QuestionController extends BaseController {
         return this.post<QuestionResponse>("/", questionData, {lang: this.loId.lang})
     }
 
-    async remove(sequenceNumber: number) {
+    async remove(sequenceNumber: number): Promise<QuestionResponse> {
         return this.delete<QuestionResponse>(`/${sequenceNumber}`, {lang: this.loId.lang});
     }
 
-    async update(sequenceNumber: number, questionData: QuestionData) {
+    async update(sequenceNumber: number, questionData: QuestionData): Promise<QuestionResponse> {
         return this.put<QuestionResponse>(`/${sequenceNumber}`, questionData, {lang: this.loId.lang});
     }
 }