diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index ab1494ec5c66011c472b9e35613fef74963c6b85..8766393a07aba11a27bdcbde3eab984d2d19450d 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -331,7 +331,8 @@ public class LecturerQuestionController extends AbstractController {
 	@RequestMapping(value = "/{questionId}/thumbs", method = RequestMethod.POST)
 	public ThumbnailResponse getThumbnails(
 			@PathVariable final String questionId,
-			@RequestBody final ThumbnailRequest thumbRequest
+			@RequestBody final ThumbnailRequest thumbRequest,
+			final HttpServletResponse response
 			) {
 		
 		return questionService.getThumbnails(questionId, thumbRequest);
@@ -340,7 +341,8 @@ public class LecturerQuestionController extends AbstractController {
 	@RequestMapping(value = "/{questionId}/answer/{answerId}/image", method = RequestMethod.GET)
 	public String getImage(
 			@PathVariable final String questionId,
-			@PathVariable final String answerId
+			@PathVariable final String answerId,
+			final HttpServletResponse response
 			) {
 		
 		return questionService.getImage(questionId, answerId);
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 73874e028054ce04e8bd61e0678c42ca873a665a..36ce12f820363b8babb5e548ccded23cccce02ea 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -463,6 +463,9 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 		}
 
 		Answer theAnswer = answer.generateAnswerEntity(user, question);
+		if ("freetext".equals(theAnswer.getType())) {
+			ImageUtils.generateThumbnailImage(theAnswer);
+		}
 
 		return databaseDao.saveAnswer(theAnswer, user, question, getSession(question.getSessionKeyword()));
 	}
@@ -477,6 +480,9 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 		}
 
 		final Question question = getQuestion(answer.getQuestionId());
+		if ("freetext".equals(answer.getType())) {
+			ImageUtils.generateThumbnailImage(answer);
+		}
 		final Answer result = databaseDao.updateAnswer(realAnswer);
 		final Session session = databaseDao.getSessionFromKeyword(question.getSessionKeyword());
 		this.publisher.publishEvent(new NewAnswerEvent(this, session, result, user, question));