diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 0abdc10bed7369fc885da0b81d6bbb1b524d0c8f..fceb127446f3cbdb421f2eaf4b3fe9c921d5ec71 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -540,7 +540,11 @@ public class CouchDBDao implements IDatabaseDao {
 		q.put("sessionId", session.get_id());
 		q.put("subject", question.getSubject());
 		q.put("text", question.getText());
-		q.put("timestamp", System.currentTimeMillis());
+		if (question.getTimestamp() != 0) {
+			q.put("timestamp", question.getTimestamp());
+		} else {
+			q.put("timestamp", System.currentTimeMillis());
+		}
 		q.put("read", false);
 		q.put("creator", user.getUsername());
 		try {