diff --git a/pkg/odo/cli/component/push.go b/pkg/odo/cli/component/push.go
index 3a933a274f1..d3aea26f9c4 100644
--- a/pkg/odo/cli/component/push.go
+++ b/pkg/odo/cli/component/push.go
@@ -61,10 +61,10 @@ func (po *PushOptions) Complete(name string, cmd *cobra.Command, args []string)
 	if experimental.IsExperimentalModeEnabled() {
 		if cmd.Flags().Changed(devfileFlagName) {
 			po.devfileFlag = true
+			return nil
 		} else {
 			po.devfileFlag = false
 		}
-		return nil
 	}
 
 	conf, err := config.NewLocalConfigInfo(po.componentContext)
@@ -98,7 +98,9 @@ func (po *PushOptions) Complete(name string, cmd *cobra.Command, args []string)
 // Validate validates the push parameters
 func (po *PushOptions) Validate() (err error) {
 
-	if experimental.IsExperimentalModeEnabled() {
+	// if experimental flag is set and `--devfile` has been explicitly done,
+	// then do nothing for now
+	if experimental.IsExperimentalModeEnabled() && po.devfileFlag {
 		return nil
 	}