diff --git a/src/Shell/BakeShell.php b/src/Shell/BakeShell.php
index 4214195fc..f6a006d63 100644
--- a/src/Shell/BakeShell.php
+++ b/src/Shell/BakeShell.php
@@ -225,7 +225,7 @@ public function all($name = null)
         if (empty($name) && !$this->param('everything')) {
             $this->Model->connection = $this->connection;
             $this->out('Possible model names based on your database:');
-            foreach ($this->Model->listAll() as $table) {
+            foreach ($this->Model->listUnskipped() as $table) {
                 $this->out('- ' . $table);
             }
             $this->out('Run <info>`cake bake all [name]`</info> to generate skeleton files.');
@@ -237,11 +237,7 @@ public function all($name = null)
 
         if ($this->param('everything')) {
             $this->Model->connection = $this->connection;
-            $allTables = collection($this->Model->listAll());
-            $filteredTables = $allTables->reject(function ($tableName) {
-                $ignoredTables = ['i18n', 'cake_sessions', 'phinxlog', 'users_phinxlog'];
-                return in_array($tableName, $ignoredTables);
-            });
+            $filteredTables = collection($this->Model->listUnskipped());
         }
 
         $filteredTables->each(function ($tableName) {