diff --git a/integration/dockerfiles/Dockerfile_test_cmd b/integration/dockerfiles/Dockerfile_test_cmd
index 631b93fd84..a2f0162b0a 100644
--- a/integration/dockerfiles/Dockerfile_test_cmd
+++ b/integration/dockerfiles/Dockerfile_test_cmd
@@ -1,4 +1,4 @@
-FROM scratch AS first
+FROM gcr.io/distroless/base@sha256:628939ac8bf3f49571d05c6c76b8688cb4a851af6c7088e599388259875bde20 AS first
 CMD ["mycmd"]
 
 FROM first
diff --git a/pkg/executor/build.go b/pkg/executor/build.go
index 10cbeca9e8..c9d08b7611 100644
--- a/pkg/executor/build.go
+++ b/pkg/executor/build.go
@@ -248,7 +248,7 @@ func reviewConfig(stage config.KanikoStage, config *v1.Config) error {
 		}
 	}
 	if entrypoint && !cmd {
-		config.Cmd = []string{}
+		config.Cmd = nil
 	}
 	return nil
 }
diff --git a/pkg/executor/build_test.go b/pkg/executor/build_test.go
index e1f1204331..51eca6f993 100644
--- a/pkg/executor/build_test.go
+++ b/pkg/executor/build_test.go
@@ -50,7 +50,7 @@ func Test_reviewConfig(t *testing.T) {
 			ENTRYPOINT ["myentrypoint"]`,
 			originalEntrypoint: []string{"myentrypoint"},
 			originalCmd:        []string{"mycmd"},
-			expectedCmd:        []string{},
+			expectedCmd:        nil,
 		},
 	}
 	for _, test := range tests {