diff --git a/lib/base.php b/lib/base.php
index 7d735f523f..7cef15001f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -921,7 +921,9 @@ class OC {
 			return false;
 		}
 
-		OC_JSON::callCheck();
+		if(!OC_Util::isCallRegistered()) {
+			return false;
+		}
 		OC_App::loadApps();
 
 		//setup extra user backends