diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 781801e5e21bcd0518dc648998a700c4bf444b35..5cd4730dbdd56901ba9dfa276e3c56dc9a1299f8 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1272,20 +1272,6 @@ public class CouchDBDao implements IDatabaseDao {
 		}
 	}
 
-	@Override
-	public Session lockSession(final Session session, final Boolean lock) {
-		try {
-			final Document s = database.getDocument(session.get_id());
-			s.put("active", lock);
-			database.saveDocument(s);
-			session.set_rev(s.getRev());
-			return session;
-		} catch (final IOException e) {
-			LOGGER.error("Could not lock session {}", session);
-		}
-		return null;
-	}
-
 	@Override
 	@CachePut(value = "sessions")
 	public Session updateSession(final Session session) {
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 09146dc25b8de2dbb20db8738ab446a58be41c03..17fba6ffee234655d4c8c686daa36728e8fdf3a9 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -126,8 +126,6 @@ public interface IDatabaseDao {
 
 	List<Session> getCourseSessions(List<Course> courses);
 
-	Session lockSession(Session session, Boolean lock);
-
 	Session updateSession(Session session);
 
 	void deleteSession(Session session);
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index bf43823c7625ebec5a83457ed50ec2590e5a24a3..330f0bde143df7c836b1f605c0e7a05aeb35ff89 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -265,8 +265,9 @@ public class SessionService implements ISessionService {
 		if (!session.isCreator(user)) {
 			throw new ForbiddenException();
 		}
+		session.setActive(lock);
 		socketIoServer.reportSessionStatus(sessionkey, lock);
-		return databaseDao.lockSession(session, lock);
+		return databaseDao.updateSession(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 6ab182634c5553f6cf6e1380bf7822135dfea483..b3c85df2f112f97f4708e5d0cc89dc0ae1cdd696 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -378,12 +378,6 @@ public class StubDatabaseDao implements IDatabaseDao {
 		return null;
 	}
 
-	@Override
-	public Session lockSession(Session session, Boolean lock) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	@Override
 	public Session updateSession(Session session) {
 		// TODO Auto-generated method stub