diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java
index 27406d9c..ba0abd37 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java
@@ -814,10 +814,13 @@ public class ClientConnectionDAOImpl implements ClientConnectionDAO {
                 .selectByExample()
                 .where(
                         ClientConnectionRecordDynamicSqlSupport.status,
-                        SqlBuilder.isIn(ClientConnection.SECURE_CHECK_STATES))
+                        SqlBuilder.isEqualTo(ConnectionStatus.ACTIVE.name()))
                 .and(
                         ClientConnectionRecordDynamicSqlSupport.examId,
                         SqlBuilder.isEqualTo(examId))
+                .and(
+                        ClientConnectionRecordDynamicSqlSupport.clientVersion,
+                        SqlBuilder.isNotNull())
                 .and(
                         ClientConnectionRecordDynamicSqlSupport.clientVersionGranted,
                         SqlBuilder.isNull())