diff --git a/cli/app/new.go b/cli/app/new.go
index 7166dd98..f6c42900 100644
--- a/cli/app/new.go
+++ b/cli/app/new.go
@@ -192,7 +192,27 @@ var AppNewCommand = &cobra.Command{
 		log.Info(i18n.G("%s created (version: %s)", appDomain, recipeVersion))
 
 		if len(secretsConfig) > 0 {
-			log.Warn(i18n.G("%s requires secret generation before deploying, run \"abra app secret generate %s --all\"", recipe.Name, appDomain))
+			var (
+				hasSecretToGenerate bool
+				hasSecretToSkip     bool
+			)
+
+			for _, secretConfig := range secretsConfig {
+				if secretConfig.SkipGenerate {
+					hasSecretToSkip = true
+					continue
+				}
+
+				hasSecretToGenerate = true
+			}
+
+			if hasSecretToGenerate && !generateSecrets {
+				log.Warn(i18n.G("%s requires secret generation before deploy, run \"abra app secret generate %s --all\"", recipe.Name, appDomain))
+			}
+
+			if hasSecretToSkip {
+				log.Warn(i18n.G("%s requires secret insertion before deploy (#generate=false)", recipe.Name))
+			}
 		}
 
 		if len(appSecrets) > 0 {