diff --git a/index.php b/index.php
index 6b8e04fb99..a0f3613583 100644
--- a/index.php
+++ b/index.php
@@ -26,8 +26,9 @@ $app = new \Espo\Core\Application();
 
 $app->isInstalled();
 
-if (empty($_GET['entryPoint'])) {
-	$app->runClient();
-} else {
+if (!empty($_GET['entryPoint'])) {
 	$app->runEntryPoint($_GET['entryPoint']);
+	exit;	
 }
+
+$app->runClient();