diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 59104e6452de..70624282d74d 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -308,6 +308,14 @@ class AppController extends BaseController
     // We need to make sure all tables are InnoDB to prevent migration failures
     public function checkInnoDB()
     {
+        $result = DB::select("SELECT engine
+                    FROM information_schema.TABLES
+                    WHERE TABLE_NAME='clients' AND TABLE_SCHEMA='ninja'");
+
+        if (count($result) && $result[0]->engine == 'InnoDB') {
+            return;
+        }
+
         $tables = DB::select('SHOW TABLES');
         $sql = "SET sql_mode = 'ALLOW_INVALID_DATES';\n";
 
diff --git a/config/database.php b/config/database.php
index a184796c2ba4..e019d61d63cd 100644
--- a/config/database.php
+++ b/config/database.php
@@ -62,6 +62,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => env('DB_STRICT', false),
+            'engine'    => 'InnoDB',
         ],
 
         'pgsql' => [