diff --git a/src/core/Elsa.Core/Metadata/ActivityPropertyOptionsResolver.cs b/src/core/Elsa.Core/Metadata/ActivityPropertyOptionsResolver.cs
index 95c03887b..99892d646 100644
--- a/src/core/Elsa.Core/Metadata/ActivityPropertyOptionsResolver.cs
+++ b/src/core/Elsa.Core/Metadata/ActivityPropertyOptionsResolver.cs
@@ -27,12 +27,7 @@ namespace Elsa.Metadata
                 return null;
 
             if (activityPropertyAttribute.OptionsProvider == null)
-            {
-                if (TryGetEnumOptions(activityPropertyInfo, out var items))
-                    return items;
-
-                return activityPropertyAttribute.Options;
-            }
+                return activityPropertyAttribute.Options ?? (TryGetEnumOptions(activityPropertyInfo, out var items) ? items : null);
 
             var providerType = activityPropertyAttribute.OptionsProvider;