diff --git a/backend/src/routes/assignments.ts b/backend/src/routes/assignments.ts
index 083ee586..4503414d 100644
--- a/backend/src/routes/assignments.ts
+++ b/backend/src/routes/assignments.ts
@@ -4,6 +4,7 @@ import {
     deleteAssignmentHandler,
     getAllAssignmentsHandler,
     getAssignmentHandler,
+    getAssignmentQuestionsHandler,
     getAssignmentsSubmissionsHandler,
     putAssignmentHandler,
 } from '../controllers/assignments.js';
@@ -23,11 +24,7 @@ router.delete('/:id', deleteAssignmentHandler);
 
 router.get('/:id/submissions', getAssignmentsSubmissionsHandler);
 
-router.get('/:id/questions', (_req, res) => {
-    res.json({
-        questions: ['0'],
-    });
-});
+router.get('/:id/questions', getAssignmentQuestionsHandler);
 
 router.use('/:assignmentid/groups', groupRouter);
 
diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts
index 7f973972..3043c23b 100644
--- a/backend/src/routes/groups.ts
+++ b/backend/src/routes/groups.ts
@@ -4,6 +4,7 @@ import {
     deleteGroupHandler,
     getAllGroupsHandler,
     getGroupHandler,
+    getGroupQuestionsHandler,
     getGroupSubmissionsHandler,
     putGroupHandler,
 } from '../controllers/groups.js';
@@ -23,4 +24,6 @@ router.delete('/:groupid', deleteGroupHandler);
 
 router.get('/:groupid/submissions', getGroupSubmissionsHandler);
 
+router.get('/:groupid/questions', getGroupQuestionsHandler);
+
 export default router;