diff --git a/lib/base.php b/lib/base.php
index d3f98ab0c1..2ec9c88e9f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -715,7 +715,8 @@ class OC {
 				OC_App::loadApps();
 			} else {
 				// For guests: Load only authentication, filesystem and logging
-				OC_App::loadApps(array('authentication', 'filesystem', 'logging'));
+				OC_App::loadApps(array('authentication'));
+				OC_App::loadApps(array('filesystem', 'logging'));
 			}
 		}
 
diff --git a/public.php b/public.php
index 3b48e129d9..eed6394811 100644
--- a/public.php
+++ b/public.php
@@ -26,7 +26,8 @@ try {
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(array('authentication', 'filesystem', 'logging'));
+	OC_App::loadApps(array('authentication'));
+	OC_App::loadApps(array('filesystem', 'logging'));
 
 	OC_Util::checkAppEnabled($app);
 	OC_App::loadApp($app);
diff --git a/remote.php b/remote.php
index 6a069ed460..232e47ee40 100644
--- a/remote.php
+++ b/remote.php
@@ -26,7 +26,8 @@ try {
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(array('authentication', 'filesystem', 'logging'));
+	OC_App::loadApps(array('authentication'));
+	OC_App::loadApps(array('filesystem', 'logging'));
 
 	switch ($app) {
 		case 'core':