diff --git a/plugins/common/common.go b/plugins/common/common.go
index 091f15451..8e0091438 100644
--- a/plugins/common/common.go
+++ b/plugins/common/common.go
@@ -74,6 +74,29 @@ func CommandUsage(helpHeader string, helpContent string) {
 	fmt.Println(columnize.Format(content, config))
 }
 
+// EnvWrap wraps a func with a setenv call and resets the value at the end
+func EnvWrap(fn func() error, environ map[string]string) error {
+	var oldEnviron map[string]string
+	for key, value := range environ {
+		oldEnviron[key] = os.Getenv(key)
+		if err := os.Setenv(key, value); err != nil {
+			return err
+		}
+	}
+
+	if err := fn(); err != nil {
+		return err
+	}
+
+	for key, value := range oldEnviron {
+		if err := os.Setenv(key, value); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // GetAppScheduler fetches the scheduler for a given application
 func GetAppScheduler(appName string) string {
 	appScheduler := ""
@@ -308,7 +331,10 @@ func IsDeployed(appName string) bool {
 			deployed = "true"
 		}
 
-		CommandPropertySet("common", appName, "deployed", deployed, DefaultProperties, GlobalProperties)
+		EnvWrap(func() error {
+			CommandPropertySet("common", appName, "deployed", deployed, DefaultProperties, GlobalProperties)
+			return nil
+		}, map[string]string{"DOKKU_QUIET_OUTPUT": "1"})
 	}
 
 	return deployed == "true"
diff --git a/plugins/common/triggers.go b/plugins/common/triggers.go
index e904c525a..813a22d45 100644
--- a/plugins/common/triggers.go
+++ b/plugins/common/triggers.go
@@ -2,7 +2,6 @@ package common
 
 import (
 	"fmt"
-	"os"
 )
 
 // TriggerAppList outputs each app name to stdout on a newline
@@ -23,11 +22,10 @@ func TriggerAppList(filtered bool) error {
 
 // TriggerCorePostDeploy associates the container with a specified network
 func TriggerCorePostDeploy(appName string) error {
-	quiet := os.Getenv("DOKKU_QUIET_OUTPUT")
-	os.Setenv("DOKKU_QUIET_OUTPUT", "1")
-	CommandPropertySet("common", appName, "deployed", "true", DefaultProperties, GlobalProperties)
-	os.Setenv("DOKKU_QUIET_OUTPUT", quiet)
-	return nil
+	return EnvWrap(func() error {
+		CommandPropertySet("common", appName, "deployed", "true", DefaultProperties, GlobalProperties)
+		return nil
+	}, map[string]string{"DOKKU_QUIET_OUTPUT": "1"})
 }
 
 // TriggerInstall runs the install step for the common plugin