diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 3106013cee2beb8e61033a478cff27e30e299976..acb949662acb2d3caab4c00cbf73299a14b39994 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -205,7 +205,11 @@ public class QuestionService implements IQuestionService {
 	@Override
 	@Authenticated
 	public List<Answer> getAnswers(String questionId, int piRound) {
-		return databaseDao.getAnswers(questionId, piRound);
+		Question question = databaseDao.getQuestion(questionId);
+
+		return "freetext".equals(question.getQuestionType())
+			? getFreetextAnswers(questionId)
+			: databaseDao.getAnswers(questionId, piRound);
 	}
 
 	@Override