diff --git a/lib/setup.php b/lib/setup.php
index 30b78123b1c..ec7dcd9dbe4 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -566,10 +566,7 @@ global $HTTPSPAGEREQUIRED;
     if (!empty($_COOKIE['MoodleSessionTest'.$CFG->sessioncookie]) && $_COOKIE['MoodleSessionTest'.$CFG->sessioncookie] == "deleted") {
         unset($_COOKIE['MoodleSessionTest'.$CFG->sessioncookie]);
     }
-    if (!empty($CFG->usesid) && empty($_COOKIE['MoodleSession'.$CFG->sessioncookie])) {
-        require_once("$CFG->dirroot/lib/cookieless.php");
-        sid_start_ob();
-    }
+
 
     if (empty($nomoodlecookie)) {
         session_name('MoodleSession'.$CFG->sessioncookie);
@@ -618,7 +615,10 @@ global $HTTPSPAGEREQUIRED;
         $FULLME = qualified_me();
         $ME = strip_querystring($FULLME);
     }
-
+    if (!empty($CFG->usesid) && empty($_COOKIE['MoodleSession'.$CFG->sessioncookie])) {
+        require_once("$CFG->dirroot/lib/cookieless.php");
+        sid_start_ob();
+    }
 /// In VERY rare cases old PHP server bugs (it has been found on PHP 4.1.2 running
 /// as a CGI under IIS on Windows) may require that you uncomment the following:
 //  session_register("USER");