diff --git a/plugins/apps/subcommands.go b/plugins/apps/subcommands.go
index bac59eb94..d8eef9ba2 100644
--- a/plugins/apps/subcommands.go
+++ b/plugins/apps/subcommands.go
@@ -48,6 +48,10 @@ func CommandClone(oldAppName string, newAppName string, skipDeploy bool, ignoreE
 		os.Setenv("SKIP_REBUILD", "true")
 	}
 
+	if err := common.PlugnTrigger("git-has-code", []string{newAppName}...); err != nil {
+		os.Setenv("SKIP_REBUILD", "true")
+	}
+
 	if err := common.PlugnTrigger("post-app-clone", []string{oldAppName, newAppName}...); err != nil {
 		return err
 	}
@@ -167,6 +171,10 @@ func CommandRename(oldAppName string, newAppName string, skipDeploy bool) error
 		os.Setenv("SKIP_REBUILD", "true")
 	}
 
+	if err := common.PlugnTrigger("git-has-code", []string{newAppName}...); err != nil {
+		os.Setenv("SKIP_REBUILD", "true")
+	}
+
 	if err := common.PlugnTrigger("post-app-rename", []string{oldAppName, newAppName}...); err != nil {
 		return err
 	}