diff --git a/packages/cli/src/commands/db.js b/packages/cli/src/commands/db.js
index 01a33db3dc65..954db6d05844 100644
--- a/packages/cli/src/commands/db.js
+++ b/packages/cli/src/commands/db.js
@@ -3,4 +3,4 @@ export const aliases = ['database']
 export const desc = 'Database tools.'
 
 export const builder = (yargs) =>
-  yargs.commandDir('./dbCommands').demandCommand().argv
+  yargs.commandDir('./dbCommands').demandCommand()
diff --git a/packages/cli/src/commands/generate.js b/packages/cli/src/commands/generate.js
index 5fd61fe10afa..6474d54fc58b 100644
--- a/packages/cli/src/commands/generate.js
+++ b/packages/cli/src/commands/generate.js
@@ -3,4 +3,4 @@ export const aliases = ['g']
 export const desc = 'Save time by generating boilerplate code.'
 
 export const builder = (yargs) =>
-  yargs.commandDir('./generate', { recurse: true }).demandCommand().argv
+  yargs.commandDir('./generate', { recurse: true }).demandCommand()
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 91b3b22bac6b..a2e797c936d1 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -19,4 +19,5 @@ yargs
     'yarn rw g page home /',
     "\"Create a page component named 'Home' at path '/'\""
   )
-  .demandCommand().argv
+  .demandCommand()
+  .strict().argv