diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index a1621935cee5..ba97295a9e96 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -34,6 +34,16 @@ class BaseController extends Controller
 
     }
 
+    /**
+     * Catch all fallback route 
+     * for non-existant route
+     */
+    public function notFound()
+    {
+        return response()->json([
+        'message' => 'Nothing to see here!'], 404);
+    }
+
     protected function errorResponse($response, $httpErrorCode = 400)
     {
         $error['error'] = $response;
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 0df6b6239a6a..9311d84c321c 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -58,11 +58,11 @@ class ClientController extends BaseController
      */
     public function index(ClientFilters $filters)
     {
+        
         $clients = Client::filter($filters);
         
         return $this->listResponse($clients);
 
-//        return response()->json($clients);
     }
 
     /**
diff --git a/routes/api.php b/routes/api.php
index 4e1585347a4e..a50b203994df 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -65,4 +65,7 @@ Route::group(['middleware' => ['db','api_secret_check','token_auth']], function
   
   Route::get('settings', 'SettingsController@index')->name('user.settings');
 
-});
\ No newline at end of file
+});
+
+
+Route::fallback('BaseController@notFound');
\ No newline at end of file