diff --git a/plugins/common/properties.go b/plugins/common/properties.go
index 5c5971fab..437ac12ce 100644
--- a/plugins/common/properties.go
+++ b/plugins/common/properties.go
@@ -64,6 +64,10 @@ func PropertyClone(pluginName string, oldAppName string, newAppName string) erro
 func PropertyDelete(pluginName string, appName string, property string) error {
 	propertyPath := getPropertyPath(pluginName, appName, property)
 	if err := os.Remove(propertyPath); err != nil {
+		if !PropertyExists(pluginName, appName, property) {
+			return nil
+		}
+
 		return fmt.Errorf("Unable to remove %s property %s.%s", pluginName, appName, property)
 	}