diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 5762a895c229..00d43c9831b3 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -34,10 +34,15 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\QueryLogging::class,
             \App\Http\Middleware\StartupCheck::class,
         ],
+        'api' => [
+            \App\Http\Middleware\ApiCheck::class,
+        ],
+        /*
         'api' => [
             'throttle:60,1',
             'bindings',
         ],
+        */
     ];
 
     /**
@@ -56,6 +61,5 @@ class Kernel extends HttpKernel
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'lookup' => \App\Http\Middleware\DatabaseLookup::class,
         'permissions.required' => \App\Http\Middleware\PermissionsRequired::class,
-        'api' => \App\Http\Middleware\ApiCheck::class,
     ];
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 87ffb05a9faf..7331eed87370 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -69,9 +69,9 @@ class RouteServiceProvider extends ServiceProvider
     protected function mapApiRoutes()
     {
         Route::group([
-            'middleware' => 'api',
+            'middleware' => ['lookup:api', 'api'],
             'namespace' => $this->namespace,
-            'prefix' => 'api',
+            'prefix' => 'api/v1',
         ], function ($router) {
             require base_path('routes/api.php');
         });
diff --git a/routes/api.php b/routes/api.php
index 492eb892562b..ac10161238ff 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,36 +1,34 @@
 <?php
 
-// Route groups for API
-Route::group(['middleware' => ['lookup:api', 'api'], 'prefix' => 'api/v1'], function () {
-    Route::get('ping', 'AccountApiController@ping');
-    Route::post('login', 'AccountApiController@login');
-    Route::post('oauth_login', 'AccountApiController@oauthLogin');
-    Route::post('register', 'AccountApiController@register');
-    Route::get('static', 'AccountApiController@getStaticData');
-    Route::get('accounts', 'AccountApiController@show');
-    Route::put('accounts', 'AccountApiController@update');
-    Route::resource('clients', 'ClientApiController');
-    Route::resource('contacts', 'ContactApiController');
-    Route::get('quotes', 'QuoteApiController@index');
-    Route::get('download/{invoice_id}', 'InvoiceApiController@download');
-    Route::resource('invoices', 'InvoiceApiController');
-    Route::resource('payments', 'PaymentApiController');
-    Route::resource('tasks', 'TaskApiController');
-    Route::resource('credits', 'CreditApiController');
-    Route::post('hooks', 'IntegrationController@subscribe');
-    Route::post('email_invoice', 'InvoiceApiController@emailInvoice');
-    Route::get('user_accounts', 'AccountApiController@getUserAccounts');
-    Route::resource('products', 'ProductApiController');
-    Route::resource('projects', 'ProjectApiController');
-    Route::resource('tax_rates', 'TaxRateApiController');
-    Route::resource('users', 'UserApiController');
-    Route::resource('expenses', 'ExpenseApiController');
-    Route::post('add_token', 'AccountApiController@addDeviceToken');
-    Route::post('remove_token', 'AccountApiController@removeDeviceToken');
-    Route::post('update_notifications', 'AccountApiController@updatePushNotifications');
-    Route::get('dashboard', 'DashboardApiController@index');
-    Route::resource('documents', 'DocumentAPIController');
-    Route::resource('vendors', 'VendorApiController');
-    Route::resource('expense_categories', 'ExpenseCategoryApiController');
-    Route::post('ios_subscription_status', 'AccountApiController@iosSubscriptionStatus');
-});
+Route::get('ping', 'AccountApiController@ping');
+Route::post('login', 'AccountApiController@login');
+Route::post('oauth_login', 'AccountApiController@oauthLogin');
+Route::post('register', 'AccountApiController@register');
+Route::get('static', 'AccountApiController@getStaticData');
+Route::get('accounts', 'AccountApiController@show');
+Route::put('accounts', 'AccountApiController@update');
+
+Route::resource('clients', 'ClientApiController');
+Route::resource('contacts', 'ContactApiController');
+Route::get('quotes', 'QuoteApiController@index');
+Route::get('download/{invoice_id}', 'InvoiceApiController@download');
+Route::resource('invoices', 'InvoiceApiController');
+Route::resource('payments', 'PaymentApiController');
+Route::resource('tasks', 'TaskApiController');
+Route::resource('credits', 'CreditApiController');
+Route::post('hooks', 'IntegrationController@subscribe');
+Route::post('email_invoice', 'InvoiceApiController@emailInvoice');
+Route::get('user_accounts', 'AccountApiController@getUserAccounts');
+Route::resource('products', 'ProductApiController');
+Route::resource('projects', 'ProjectApiController');
+Route::resource('tax_rates', 'TaxRateApiController');
+Route::resource('users', 'UserApiController');
+Route::resource('expenses', 'ExpenseApiController');
+Route::post('add_token', 'AccountApiController@addDeviceToken');
+Route::post('remove_token', 'AccountApiController@removeDeviceToken');
+Route::post('update_notifications', 'AccountApiController@updatePushNotifications');
+Route::get('dashboard', 'DashboardApiController@index');
+Route::resource('documents', 'DocumentAPIController');
+Route::resource('vendors', 'VendorApiController');
+Route::resource('expense_categories', 'ExpenseCategoryApiController');
+Route::post('ios_subscription_status', 'AccountApiController@iosSubscriptionStatus');