diff --git a/pkg/state/state.go b/pkg/state/state.go
index 3c2b8f36..41c7c27d 100644
--- a/pkg/state/state.go
+++ b/pkg/state/state.go
@@ -520,6 +520,11 @@ func (o *SyncOpts) Apply(opts *SyncOpts) {
 func ReleaseToID(r *ReleaseSpec) string {
 	var id string
 
+	kc := r.KubeContext
+	if kc != "" {
+		id += kc + "/"
+	}
+
 	tns := r.TillerNamespace
 	if tns != "" {
 		id += tns + "/"