diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index 62b0a52e3bf0d50a8c131bce0c4a582cc016c7d6..cd158b3fe6b35cd0dd8d58b11c3b440a61d55863 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -639,7 +639,7 @@ class Session implements \Serializable, Utils\ClearableState
         $this->authToken = Utils\Random::generateID();
         $sessionHandler = SessionHandler::getSessionHandler();
 
-        if (!$this->transient && (!empty($data['RememberMe']) || $this->rememberMeExpire) &&
+        if (!$this->transient && (!empty($data['RememberMe']) || $this->rememberMeExpire !== null) &&
             self::$config->getBoolean('session.rememberme.enable', false)
         ) {
             $this->setRememberMeExpire();
@@ -685,7 +685,7 @@ class Session implements \Serializable, Utils\ClearableState
         $this->callLogoutHandlers($authority);
         unset($this->authData[$authority]);
 
-        if (!$this->isValid($authority) && $this->rememberMeExpire) {
+        if (!$this->isValid($authority) && $this->rememberMeExpire !== null) {
             $this->rememberMeExpire = null;
             $this->updateSessionCookies();
         }