diff --git a/ocs/v1.php b/ocs/v1.php
index e513857658..3f165009f4 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -51,13 +51,16 @@ use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 try {
 	OC_App::loadApps(['session']);
 	OC_App::loadApps(['authentication']);
+
+	// load all apps to get all api routes properly setup
+	// FIXME: this should ideally appear after handleLogin but will cause
+	// side effects in existing apps
+	OC_App::loadApps();
+
 	if (!\OC::$server->getUserSession()->isLoggedIn()) {
 		OC::handleLogin(\OC::$server->getRequest());
 	}
 
-	// load all apps to get all api routes properly setup
-	OC_App::loadApps();
-
 	OC::$server->get(\OC\Route\Router::class)->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
 } catch (ResourceNotFoundException $e) {
 	OC_API::setContentType();