diff --git a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java
index 02928a5d95fc5ef985686cb3794c0e5681d887ed..73aa0550e8370037b0fd99fe62a23a689f133448 100644
--- a/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java
+++ b/src/main/java/de/thm/arsnova/persistence/couchdb/CouchDbContentRepository.java
@@ -228,7 +228,8 @@ public class CouchDbContentRepository extends CouchDbCrudRepository<Content> imp
 		final List<String> unanswered = new ArrayList<>();
 
 		for (final Content content : contents) {
-			if (!"slide".equals(content.getFormat()) && (!answeredQuestions.containsKey(content.getId())
+			// TODO: Set correct format for slides, which currently aren't implemented
+			if (Content.Format.TEXT != content.getFormat() && (!answeredQuestions.containsKey(content.getId())
 					|| (answeredQuestions.containsKey(content.getId()) && answeredQuestions.get(content.getId()) != content.getState().getRound()))) {
 				unanswered.add(content.getId());
 			}
diff --git a/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java b/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java
index 386a49c3b26c196792d92c1a1592917e88b1985d..40b07f175fedad40329e6f930d3c00ec4ab6ecf3 100644
--- a/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/service/TimerServiceImpl.java
@@ -115,7 +115,7 @@ public class TimerServiceImpl implements TimerService, ApplicationEventPublisher
 		final Room room = roomRepository.findOne(content.getRoomId());
 		cancelDelayedRoundChange(contentId);
 
-		if ("freetext".equals(content.getFormat())) {
+		if (Content.Format.TEXT == content.getFormat()) {
 			content.getState().setRound(0);
 		} else {
 			content.getState().setRound(1);