diff --git a/cli/app/deploy.go b/cli/app/deploy.go
index 3b412f12..2ac6eea4 100644
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@@ -300,6 +300,16 @@ func validateArgsAndFlags(args []string) error {
 }
 
 func validateSecrets(cl *dockerClient.Client, app appPkg.App) error {
+	composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
+	if err != nil {
+		return err
+	}
+
+	secretsConfig, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
+	if err != nil {
+		return err
+	}
+
 	secStats, err := secret.PollSecretsStatus(cl, app)
 	if err != nil {
 		return err
@@ -307,6 +317,10 @@ func validateSecrets(cl *dockerClient.Client, app appPkg.App) error {
 
 	for _, secStat := range secStats {
 		if !secStat.CreatedOnRemote {
+			secretConfig := secretsConfig[secStat.LocalName]
+			if secretConfig.SkipGenerate {
+				return errors.New(i18n.G("secret not inserted (#generate=false): %s", secStat.LocalName))
+			}
 			return errors.New(i18n.G("secret not generated: %s", secStat.LocalName))
 		}
 	}