diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
index 8f4c4417b..98530c6c5 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
@@ -124,6 +124,10 @@ public class BasicTokenSessionMap implements TokenSessionMap {
                 Map.Entry<String, GuacamoleSession> entry = entries.next();
                 GuacamoleSession session = entry.getValue();
 
+                // Do not expire sessions which are active
+                if (session.hasTunnels())
+                    continue;
+
                 // Get elapsed time since last access
                 long age = now - session.getLastAccessedTime();