diff --git a/lib/SimpleSAML/AuthMemCookie.php b/lib/SimpleSAML/AuthMemCookie.php
index ab69515efd72ef95bcedf449bbab578f466c1369..ef8a0773fbd98fe430a9afd8ea02b89d66cb4ab0 100644
--- a/lib/SimpleSAML/AuthMemCookie.php
+++ b/lib/SimpleSAML/AuthMemCookie.php
@@ -145,8 +145,7 @@ class SimpleSAML_AuthMemCookie
         $memcache->delete($sessionID);
 
         // delete the session cookie
-        $sessionHandler = SimpleSAML_SessionHandler::getSessionHandler();
-        $sessionHandler->setCookie($cookieName, null);
+        \SimpleSAML\Utils\HTTP::setCookie($cookieName, null);
     }
 
 
diff --git a/www/authmemcookie.php b/www/authmemcookie.php
index 77379f64d25404aa17549f840504c4932b87593a..a24b0556b71674b674fc6cb919e9b6ffb151bd93 100644
--- a/www/authmemcookie.php
+++ b/www/authmemcookie.php
@@ -34,11 +34,8 @@ try {
 
     // generate session id and save it in a cookie
     $sessionID = SimpleSAML\Utils\Random::generateID();
-
     $cookieName = $amc->getCookieName();
-
-    $sessionHandler = SimpleSAML_SessionHandler::getSessionHandler();
-    $sessionHandler->setCookie($cookieName, $sessionID);
+    \SimpleSAML\Utils\HTTP::setCookie($cookieName, $sessionID);
 
     // generate the authentication information
     $attributes = $s->getAttributes();