diff --git a/app/controllers/general.php b/app/controllers/general.php
index 316fb85e0c..c56b312357 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -100,14 +100,15 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
     * Response format
     */
     $responseFormat = $request->getHeader('x-appwrite-response-format', App::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
-    switch($responseFormat) {
-        case version_compare ($responseFormat , '0.6.2', '=<') :
-            Response::setFilter(new V06());
-            break;
-        default:
-            throw new Exception('No filter available for response format : '.$responseFormat, 404);
+    if (!empty($responseFormat)) {
+        switch($responseFormat) {
+            case version_compare ($responseFormat , '0.6.2', '=<') :
+                Response::setFilter(new V06());
+                break;
+            default:
+                throw new Exception('No filter available for response format : '.$responseFormat, 400);
+        }
     }
-    
 
     /*
      * Security Headers
diff --git a/app/http.php b/app/http.php
index c409230418..9e27f21375 100644
--- a/app/http.php
+++ b/app/http.php
@@ -50,11 +50,6 @@ $http->on('AfterReload', function($serv, $workerId) {
 
 $http->on('start', function (Server $http) use ($payloadSize) {
 
-    if(empty($responseFormat)) {
-        Console::error('Missing value for environment variable _APP_SYSTEM_RESPONSE_FORMAT. Exiting ...');
-        exit(1);
-    }
-
     Console::success('Server started succefully (max payload is '.number_format($payloadSize).' bytes)');
 
     Console::info("Master pid {$http->master_pid}, manager pid {$http->manager_pid}");