diff --git a/src/model/pattern-library/builtins/conditional.ts b/src/model/pattern-library/builtins/conditional.ts
index abd11bcda..5a6593ffb 100644
--- a/src/model/pattern-library/builtins/conditional.ts
+++ b/src/model/pattern-library/builtins/conditional.ts
@@ -18,6 +18,7 @@ export const Conditional = (context: BuiltInContext): BuiltInResult => {
 			defaultValue: true,
 			hidden: false,
 			id: context.options.getGlobalPropertyId(patternId, CONDITION_CONTEXT_ID),
+			inputType: Types.PatternPropertyInputType.Default,
 			label: 'Condition',
 			origin: Types.PatternPropertyOrigin.BuiltIn,
 			propertyName: 'condition',
diff --git a/src/model/pattern-library/pattern-library.ts b/src/model/pattern-library/pattern-library.ts
index bedaa98e1..ab7d5fe74 100644
--- a/src/model/pattern-library/pattern-library.ts
+++ b/src/model/pattern-library/pattern-library.ts
@@ -218,7 +218,7 @@ export class PatternLibrary {
 	public assignEnumOptionId(enumId: string, contextId: string): string {
 		const enumProperty = this.getPatternPropertyById(enumId) as PatternEnumProperty;
 
-		if (!enumProperty) {
+		if (!enumProperty || typeof enumProperty.getOptionByContextId !== 'function') {
 			return uuid.v4();
 		}