diff --git a/www/authmemcookie.php b/www/authmemcookie.php
index fa6c40e05aae425ea205c2962ccb96c969715518..db8ab9a000f8d714a8f1c81afab5f9c8661f8161 100644
--- a/www/authmemcookie.php
+++ b/www/authmemcookie.php
@@ -103,7 +103,8 @@ try {
 
 
 	$memcache = $amc->getMemcache();
-	$memcache->set($sessionID, $data);
+	$expirationTime = $session->remainingTime();
+	$memcache->set($sessionID, $data, 0, $expirationTime);
 
 	/* Register logout handler. */
 	$session->registerLogoutHandler('SimpleSAML_AuthMemCookie', 'logoutHandler');
@@ -113,5 +114,3 @@ try {
 } catch(Exception $e) {
 	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'CONFIG', $e);
 }
-
-?>
\ No newline at end of file