diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index ff4f334464fd..b5e4301035fb 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -27,6 +27,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/cluster"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/console"
+	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
 	pkgutil "k8s.io/minikube/pkg/util"
@@ -69,6 +70,12 @@ itself, leaving all files intact. The cluster can be started again with the "sta
 		if err := cmdUtil.KillMountProcess(); err != nil {
 			exit.WithError("Unable to kill mount process", err)
 		}
+
+		machineName := pkg_config.GetMachineName()
+		err = pkgutil.UnsetCurrentContext(constants.KubeconfigPath, machineName)
+		if err != nil {
+			exit.WithError("update config", err)
+		}
 	},
 }
 
diff --git a/pkg/util/kubeconfig.go b/pkg/util/kubeconfig.go
index 863b6c2e206c..887c7a884111 100644
--- a/pkg/util/kubeconfig.go
+++ b/pkg/util/kubeconfig.go
@@ -312,3 +312,16 @@ func GetPortFromKubeConfig(filename, machineName string) (int, error) {
 	port, err := strconv.Atoi(kport)
 	return port, err
 }
+
+//UnsetCurrentContext unsets the current-context from minikube to "" on minikube stop
+func UnsetCurrentContext(filename, machineName string) error {
+	confg, err := ReadConfigOrNew(filename)
+	if err != nil {
+		return errors.Wrap(err, "Error getting kubeconfig status")
+	}
+	confg.CurrentContext = ""
+	if err := WriteConfig(confg, filename); err != nil {
+		return errors.Wrap(err, "writing kubeconfig")
+	}
+	return nil
+}
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 9cf29a3a377f..4a740a50c245 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -77,6 +77,16 @@ func TestStartStop(t *testing.T) {
 				t.Fatalf("IP command returned an invalid address: %s", ip)
 			}
 
+			// check for the current-context before and after the stop
+			kubectlRunner := util.NewKubectlRunner(t)
+			currentContext, err := kubectlRunner.RunCommand([]string{"config", "current-context"})
+			if err != nil {
+				t.Fatalf("Failed to fetch current-context")
+			}
+			if strings.TrimRight(string(currentContext), "\n") != "minikube" {
+				t.Fatalf("got current-context - %q, want  current-context %q", string(currentContext), "minikube")
+			}
+
 			checkStop := func() error {
 				r.RunCommand("stop", true)
 				return r.CheckStatusNoFail(state.Stopped.String())
@@ -86,6 +96,11 @@ func TestStartStop(t *testing.T) {
 				t.Fatalf("timed out while checking stopped status: %v", err)
 			}
 
+			// running this command results in error when the current-context is not set
+			if err := r.Run("config current-context"); err != nil {
+				t.Logf("current-context is not set to minikube")
+			}
+
 			r.Start(test.args...)
 			r.CheckStatus(state.Running.String())