diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 4b3b3af98e7bb0dbf7d875ca5182922a69c1f2da..6e7784efde760a179b289ba84b4a6ce850e572df 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -550,6 +550,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;
 	}
@@ -1296,7 +1297,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 8941b37e9b0c648d6e1b6b1d3c055f082fa41630..fa9d4956baa7bb0348c02139a74651a6d97c993c 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -67,6 +67,7 @@ public class Question {
 	private String scaleFactor;
 	private String gridScaleFactor;
 	private boolean imageQuestion;
+	private boolean textAnswerEnabled;
 
 	public final String getType() {
 		return type;
@@ -183,11 +184,11 @@ public class Question {
 	public final int getDuration() {
 		return duration;
 	}
-	
+
 	public final boolean isImageQuestion() {
 		return imageQuestion;
 	}
-	
+
 	public void setImageQuestion(boolean imageQuestion) {
 		this.imageQuestion = imageQuestion;
 	}
@@ -420,6 +421,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;