diff --git a/packages/strapi-generate-new/lib/before.js b/packages/strapi-generate-new/lib/before.js
index 009132495c..9ebb87920a 100644
--- a/packages/strapi-generate-new/lib/before.js
+++ b/packages/strapi-generate-new/lib/before.js
@@ -133,12 +133,9 @@ module.exports = (scope, cb) => {
 
     scope.quick = answers.type === 'quick' || scope.quick;
     const isQuick = scope.quick;
-
+    
     if (isQuick) {
-      trackSuccess('didChooseQuickstart', scope);
       answers.client = databaseChoices[0].value;
-    } else {
-      trackSuccess('didChooseCustomDatabase', scope);
     }
 
     if (hasDatabaseConfig) {
@@ -355,6 +352,12 @@ module.exports = (scope, cb) => {
         console.log(`The app has been connected to the database ${green('successfully')}!`);
         console.log();
       }
+      
+      if (isQuick) {
+        trackSuccess('didChooseQuickstart', scope);
+      } else {
+        trackSuccess('didChooseCustomDatabase', scope);
+      }
 
       trackSuccess('didConnectDatabase', scope);