diff --git a/api/manifest/manifest.go b/api/manifest/manifest.go
index eb5e565624..7f71096fae 100644
--- a/api/manifest/manifest.go
+++ b/api/manifest/manifest.go
@@ -929,13 +929,17 @@ func getLinkEntryEnv(linkEntry ManifestEntry) (map[string]string, error) {
 
 	for _, val := range inspect[0].Config.Env {
 		parts := strings.SplitN(val, "=", 2)
-		linkEntryEnv[parts[0]] = parts[1]
+		if len(parts) == 2 {
+			linkEntryEnv[parts[0]] = parts[1]
+		}
 	}
 
 	//override with manifest env
 	for _, value := range linkEntry.EnvironmentArray() {
 		parts := strings.SplitN(value, "=", 2)
-		linkEntryEnv[parts[0]] = parts[1]
+		if len(parts) == 2 {
+			linkEntryEnv[parts[0]] = parts[1]
+		}
 	}
 
 	return linkEntryEnv, nil
diff --git a/api/models/release.go b/api/models/release.go
index 2b1449f379..9032d1bd91 100644
--- a/api/models/release.go
+++ b/api/models/release.go
@@ -358,8 +358,10 @@ func (r *Release) resolveLinks(manifest *Manifest) (Manifest, error) {
 		for _, val := range linkableEnvs {
 			if strings.HasPrefix(val, "LINK_") {
 				parts := strings.SplitN(val, "=", 2)
-				entry.Exports[parts[0]] = parts[1]
-				m[i] = entry
+				if len(parts) == 2 {
+					entry.Exports[parts[0]] = parts[1]
+					m[i] = entry
+				}
 			}
 		}
 	}