diff --git a/cmd/start.go b/cmd/start.go
index 1d5066d..3f745af 100644
--- a/cmd/start.go
+++ b/cmd/start.go
@@ -66,8 +66,8 @@ microcks start --name [name of you container/instance]`,
 				errors.CheckError(err)
 				if !exists {
 					fmt.Printf("Container for instance %s no longer exists, recreating it\n", name)
+					localConfig.RemoveInstance(instance.ContainerID)
 					instance.Status = ""
-					instance.ContainerID = ""
 				}
 			}
 
diff --git a/cmd/stop.go b/cmd/stop.go
index eaba91f..f94c884 100644
--- a/cmd/stop.go
+++ b/cmd/stop.go
@@ -59,7 +59,7 @@ func NewStopCommand(globalClientOpts *connectors.ClientOptions) *cobra.Command {
 				_ = localConfig.RemoveServer(ctx.Server.Server)
 				_ = localConfig.RemoveUser(ctx.User.Name)
 				_ = localConfig.RemoveAuth(ctx.Server.Server)
-				_ = localConfig.RemoveInstance(instance.Name)
+				_ = localConfig.RemoveInstance(instance.ContainerID)
 
 				localConfig.CurrentContext = ""
 				log.Printf("Instance %s removed successfully", instance.Name)
diff --git a/pkg/config/localconfig.go b/pkg/config/localconfig.go
index 1e5eeda..5deb95e 100644
--- a/pkg/config/localconfig.go
+++ b/pkg/config/localconfig.go
@@ -321,12 +321,12 @@ func (l *LocalConfig) UpsertInstance(instance Instance) {
 }
 
 // Returns true if server was removed successfully
-func (l *LocalConfig) RemoveInstance(instanceName string) bool {
-	if instanceName == "" {
+func (l *LocalConfig) RemoveInstance(instanceID string) bool {
+	if instanceID == "" {
 		return true
 	}
 	for a, i := range l.Instances {
-		if i.Name == instanceName {
+		if i.ContainerID == instanceID {
 			l.Instances = append(l.Instances[:a], l.Instances[a+1:]...)
 			return true
 		}