diff --git a/bin/cli-setup b/bin/cli-setup
index 680fba91a..9ecdecc95 100755
--- a/bin/cli-setup
+++ b/bin/cli-setup
@@ -35,15 +35,6 @@ program
 
 const performSetup = async () => {
 
-  if (program.defaults) {
-    await SettingsService.init();
-
-    console.log('Settings created.');
-    console.log('\nTalk is now installed!');
-
-    return;
-  }
-
   // Get the current settings, we are expecing an error here.
   try {
 
@@ -63,6 +54,15 @@ const performSetup = async () => {
     }
   }
 
+  if (program.defaults) {
+    await SettingsService.init();
+
+    console.log('Settings created.');
+    console.log('\nTalk is now installed!');
+
+    return;
+  }
+
   // Create the base settings model.
   let settings = new SettingModel();