diff --git a/lib/base.php b/lib/base.php
index 05d151439a463e018338ee17eef0586374007b7a..1720a5fd7e1a04490f52a7203ae94ecc708bdd95 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -376,9 +376,6 @@ class OC {
 		self::$loader->registerPrefix('Patchwork', '3rdparty');
 		spl_autoload_register(array(self::$loader, 'load'));
 
-		// setup the basic server
-		self::$server = new \OC\Server();
-
 		// set some stuff
 		//ob_start();
 		error_reporting(E_ALL | E_STRICT);
@@ -458,6 +455,9 @@ class OC {
 		stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
 		stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
+		// setup the basic server
+		self::$server = new \OC\Server();
+
 		self::initTemplateEngine();
 		if (!self::$CLI) {
 			self::initSession();