diff --git a/pkg/cli/apps.go b/pkg/cli/apps.go
index 3ab910512..c1a8cc6fd 100644
--- a/pkg/cli/apps.go
+++ b/pkg/cli/apps.go
@@ -411,10 +411,11 @@ func appExport(rack sdk.Interface, c *stdcli.Context, app string, w io.Writer) e
 		return err
 	}
 
-	for k, v := range a.Parameters {
-		if v == "****" {
-			delete(a.Parameters, k)
-		}
+	// Remove app unique parameters before exporting app
+	uniqueParams := []string{"Rack","LogBucket","ResourcePassword","ParamPassword"}
+
+	for _,param := range uniqueParams{
+		delete(a.Parameters, param);
 	}
 
 	data, err := json.Marshal(a)
@@ -576,6 +577,13 @@ func appImport(rack sdk.Interface, c *stdcli.Context, app string, r io.Reader) e
 
 		change := false
 
+		// Remove app unique parameters from being copied over
+		uniqueParams := []string{"Rack","LogBucket","ResourcePassword"}
+
+		for _,param := range uniqueParams{
+			delete(a.Parameters, param);
+		}
+
 		for k, v := range a.Parameters {
 			if v != ae.Parameters[k] {
 				change = true