diff --git a/pkg/apis/apps.kubermatic/v1/application_installation.go b/pkg/apis/apps.kubermatic/v1/application_installation.go
index 468a4ceabb..e7dadcfddb 100644
--- a/pkg/apis/apps.kubermatic/v1/application_installation.go
+++ b/pkg/apis/apps.kubermatic/v1/application_installation.go
@@ -294,7 +294,7 @@ func (ai *ApplicationInstallationSpec) GetParsedValues() (map[string]interface{}
 	if len(ai.Values.Raw) > 0 && string(ai.Values.Raw) != "{}" && ai.ValuesBlock != "" {
 		return nil, fmt.Errorf("the fields Values and ValuesBlock cannot be used simultaneously. Please delete one of them.")
 	}
-	if len(ai.Values.Raw) > 0 {
+	if len(ai.Values.Raw) > 0 && string(ai.Values.Raw) != "{}" {
 		err := json.Unmarshal(ai.Values.Raw, &values)
 		return values, err
 	}
diff --git a/pkg/apis/apps.kubermatic/v1/application_installation_test.go b/pkg/apis/apps.kubermatic/v1/application_installation_test.go
index a9fbadf25b..2b9f91678b 100644
--- a/pkg/apis/apps.kubermatic/v1/application_installation_test.go
+++ b/pkg/apis/apps.kubermatic/v1/application_installation_test.go
@@ -46,7 +46,7 @@ func TestGetParsedValues(t *testing.T) {
 		},
 		"ValuesBlock set and Values Defaulted": {
 			appIn: ApplicationInstallationSpec{
-				Values:      runtime.RawExtension{},
+				Values:      runtime.RawExtension{Raw: []byte("{}")},
 				ValuesBlock: "not-empty:\n  value",
 			},
 			expResponse: map[string]interface{}{"not-empty": "value"},