diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 1e2b29a3a4ebcf9cc633e9eb21e4eec38c4f1058..4dcf5fb874f3dd44e9f23228160cf8410b00caf1 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -549,6 +549,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 		q.put("scaleFactor", question.getScaleFactor());
 		q.put("gridScaleFactor", question.getGridScaleFactor());
 		q.put("imageQuestion", question.isImageQuestion());
+		q.put("textAnswerEnabled", question.isTextAnswerEnabled());
 
 		return q;
 	}
@@ -1307,7 +1308,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 			a.put("abstention", answer.isAbstention());
 			a.put("questionValue", answer.getQuestionValue());
 			a.put("answerImage", answer.getAnswerImage());
-			
+
 			a.put("answerThumbnailImage", answer.getAnswerThumbnailImage());
 			database.saveDocument(a);
 			answer.set_rev(a.getRev());
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index 1e908689c2fdebd235a49d1f364c9e2372677537..b1c215989a506690e9676b428cbf9bc6b8f40d4c 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -71,6 +71,7 @@ public class Question {
 	private String scaleFactor;
 	private String gridScaleFactor;
 	private boolean imageQuestion;
+	private boolean textAnswerEnabled;
 
 	public final String getType() {
 		return type;
@@ -187,11 +188,11 @@ public class Question {
 	public final int getDuration() {
 		return duration;
 	}
-	
+
 	public final boolean isImageQuestion() {
 		return imageQuestion;
 	}
-	
+
 	public void setImageQuestion(boolean imageQuestion) {
 		this.imageQuestion = imageQuestion;
 	}
@@ -448,6 +449,14 @@ public class Question {
 		return this.gridScaleFactor;
 	}
 
+	public boolean isTextAnswerEnabled() {
+		return this.textAnswerEnabled;
+	}
+
+	public void setTextAnswerEnabled(boolean textAnswerEnabled) {
+		this.textAnswerEnabled = textAnswerEnabled;
+	}
+
 	@Override
 	public final String toString() {
 		return "Question type '" + type + "': " + subject + ";\n" + text + possibleAnswers;