diff --git a/src/modules/metadata/Metadata.constants.ts b/src/modules/metadata/Metadata.constants.ts
index 363055d9..da32e494 100644
--- a/src/modules/metadata/Metadata.constants.ts
+++ b/src/modules/metadata/Metadata.constants.ts
@@ -48,9 +48,13 @@ const convertToBoolean = (value: string): boolean => value === 'true';
 const convertToStringNullAndUndefined = (value: string) => convertToTypeNullAndUndefined(value, convertToString);
 const convertToBooleanNullAndUndefined = (value: string) => convertToTypeNullAndUndefined(value, convertToBoolean);
 const convertToObject = <T>(value: string, defaultValue: T): T => {
-    const convertedValue = jsonSaveParse(value) ?? defaultValue;
+    const convertedValue = jsonSaveParse<T>(value) ?? defaultValue;
 
-    if (Array.isArray(defaultValue)) {
+    if (Array.isArray(convertedValue)) {
+        return convertedValue;
+    }
+
+    if (defaultValue == null) {
         return convertedValue;
     }