diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index bb480de4b2354ab0ba6ad496136b36b22d7d0dd2..ef96970be6626a76972dd628edc4a123dc278418 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -260,10 +260,10 @@ public class CouchDBDao implements IDatabaseDao {
 	}
 
 	@Override
-	public final int getSkillQuestionCount(final String sessionkey) {
+	public final int getSkillQuestionCount(final Session session) {
 		try {
 			View view = new View("skill_question/count_by_session");
-			view.setKey(URLEncoder.encode("\"" + sessionkey + "\"", "UTF-8"));
+			view.setKey(URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8"));
 			ViewResults results = this.getDatabase().view(view);
 
 			if (results.getJSONArray("rows").optJSONObject(0) == null) {
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 673ca988358d9ca903a84d5e0037dabc5529b502..574891cb65233480ff84375eeeccc23e7c0c4796 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -57,7 +57,7 @@ public interface IDatabaseDao {
 
 	List<Question> getSkillQuestions(String session);
 
-	int getSkillQuestionCount(String sessionkey);
+	int getSkillQuestionCount(Session session);
 
 	LoggedIn registerAsOnlineUser(User u, Session s);
 
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index d1f42986e26053c5632dadf906d0c101c354240e..9f82ac39bc8e4549cb6cdf2d066b30074806e6c0 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -63,7 +63,8 @@ public class QuestionService implements IQuestionService {
 	@Override
 	@Authenticated
 	public int getSkillQuestionCount(String sessionkey) {
-		return databaseDao.getSkillQuestionCount(sessionkey);
+		Session session = this.databaseDao.getSessionFromKeyword(sessionkey);
+		return databaseDao.getSkillQuestionCount(session);
 	}
 
 	@Override
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index fd0b45520b60bf85f99fd71602c64351cf77e8f2..f653c5e892c06693cb38079426231a17ddd3b723 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -214,8 +214,8 @@ public class StubDatabaseDao implements IDatabaseDao {
 	}
 
 	@Override
-	public int getSkillQuestionCount(String sessionkey) {
-		return stubQuestions.get(sessionkey).size();
+	public int getSkillQuestionCount(Session session) {
+		return stubQuestions.get(session.getKeyword()).size();
 	}
 
 	@Override