diff --git a/pkg/minikube/kubeconfig/testdata/kubeconfig/config1 b/pkg/minikube/kubeconfig/testdata/kubeconfig/config1
index 8c497d4ccb..7e39058ec1 100644
--- a/pkg/minikube/kubeconfig/testdata/kubeconfig/config1
+++ b/pkg/minikube/kubeconfig/testdata/kubeconfig/config1
@@ -1,7 +1,7 @@
 apiVersion: v1
-clusters: []
-contexts: []
+clusters: null
+contexts: null
 current-context: minikube
 kind: Config
 preferences: {}
-users: []
+users: null
diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go
index 3085c8eda9..e9cb5309c7 100644
--- a/pkg/minikube/registry/drvs/docker/docker.go
+++ b/pkg/minikube/registry/drvs/docker/docker.go
@@ -42,15 +42,13 @@ func init() {
 }
 
 func configure(mc config.MachineConfig) interface{} {
-	cp, _ := config.PrimaryControlPlane(mc)
 	return kic.NewDriver(kic.Config{
-		MachineName:  mc.Name,
-		StorePath:    localpath.MiniPath(),
-		ImageDigest:  kic.BaseImage,
-		CPU:          mc.CPUs,
-		Memory:       mc.Memory,
-		HostBindPort: cp.Port,
-		OCIBinary:    oci.Docker,
+		MachineName: mc.Name,
+		StorePath:   localpath.MiniPath(),
+		ImageDigest: kic.BaseImage,
+		CPU:         mc.CPUs,
+		Memory:      mc.Memory,
+		OCIBinary:   oci.Docker,
 	})
 
 }