diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 05a1fc898cc99cb73e2fbb4dff03402b28dab611..260a665b4a4150f458a062771040a53a410bf2a5 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -801,7 +801,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 	public Session updateSessionOwnerActivity(final Session session) {
 		try {
 			/* Do not clutter CouchDB. Only update once every 3 hours. */
-			if (session.getLastOwnerActivity() > System.currentTimeMillis() - 3 * 3600000) {
+			if (session.getLastOwnerActivity() > System.currentTimeMillis() - 60 * 1000) {
 				return session;
 			}
 
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index a9aa671c9c0b3d70a35df770925d389499413074..378684fc20720b154292d4547dc1e4eff10c96c1 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -99,8 +99,8 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
 		}
 	}
 
-	private static final long SESSION_INACTIVITY_CHECK_INTERVAL_MS = 30 * 60 * 1000L;
-	private static final long SESSION_INACTIVITY_THRESHOLD_MS = 90 * 24 * 60 * 60 * 1000L;
+	private static final long SESSION_INACTIVITY_CHECK_INTERVAL_MS = 60 * 1000L; // 30 * 60 * 1000L;
+	private static final long SESSION_INACTIVITY_THRESHOLD_MS = 3 * 60 * 1000L; // 90 * 24 * 60 * 60 * 1000L;
 
 	@Autowired
 	private IDatabaseDao databaseDao;