diff --git a/Xpand/Xpand.ExpressApp.Modules/StateMachine/Controllers/EnableStatePropertyController.cs b/Xpand/Xpand.ExpressApp.Modules/StateMachine/Controllers/EnableStatePropertyController.cs
index c179283334..77538930b4 100644
--- a/Xpand/Xpand.ExpressApp.Modules/StateMachine/Controllers/EnableStatePropertyController.cs
+++ b/Xpand/Xpand.ExpressApp.Modules/StateMachine/Controllers/EnableStatePropertyController.cs
@@ -57,7 +57,7 @@ public class EnableStatePropertyController : DisableStatePropertyController {
         }
 
         IList GetEditorItems(PropertyEditor propertyEditor) {
-            if (!XpandModuleBase.IsHosted) {
+            if (!Application.IsHosted()) {
                 var value = EditorProperties(propertyEditor);
                 var type = Application.TypesInfo.FindTypeInfo("DevExpress.XtraEditors.Repository.RepositoryItemComboBox").Type;
                 return ((IList)type.GetProperty("Items").GetValue(value, null));
@@ -150,7 +150,7 @@ public class EnableStatePropertyController : DisableStatePropertyController {
         }
 
         protected virtual void Init(PropertyEditor propertyEditor) {
-            if (!XpandModuleBase.IsHosted) {
+            if (!Application.IsHosted()) {
                 var editorItems = GetEditorItems(propertyEditor);
                 editorItems.Clear();
                 var editorProperties = EditorProperties(propertyEditor);