diff --git a/src/WorkFlow.Application/Dto/ProfileObjStateDto.cs b/src/WorkFlow.Application/Dto/ProfileObjStateDto.cs
deleted file mode 100644
index df50988..0000000
--- a/src/WorkFlow.Application/Dto/ProfileObjStateDto.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace WorkFlow.Application.Dto;
-
-public class ProfileObjStateDto
-{
-    public IEnumerable<string?> States { get; set; } = Array.Empty<string>();
-}
\ No newline at end of file
diff --git a/src/WorkFlow.Application/MappingProfile.cs b/src/WorkFlow.Application/MappingProfile.cs
index 2cde9c9..fbc920b 100644
--- a/src/WorkFlow.Application/MappingProfile.cs
+++ b/src/WorkFlow.Application/MappingProfile.cs
@@ -12,7 +12,6 @@ public class MappingProfile : AutoMapper.Profile
         CreateMap<Config, ConfigDto>();
         CreateMap<Profile, ProfileDto>();
         CreateMap<ProfileControlsTF, ProfileControlsTFDto>();
-        CreateMap<ProfileObjState, ProfileObjStateDto>();
         CreateMap<State, StateDto>();
         CreateMap<Button, ButtonDto>();
         CreateMap<ProfileObject, ObjectDto>()
@@ -20,6 +19,6 @@ public class MappingProfile : AutoMapper.Profile
             new[] { src.Headline1, src.Headline2 }))
         .ForMember(dest => dest.Sublines, opt => opt.MapFrom(src =>
             new[] { src.Subline1, src.Subline2 }))
-        .ForMember(dest => dest.States, opt => opt.MapFrom(src => src.States));
+        .ForMember(dest => dest.States, opt => opt.MapFrom(src => src.States != null ? src.States.ToList() : Array.Empty<string>()));
     }
 }
\ No newline at end of file
diff --git a/src/WorkFlow.Domain/Entities/ProfileObjState.cs b/src/WorkFlow.Domain/Entities/ProfileObjState.cs
index ffb856e..bf67488 100644
--- a/src/WorkFlow.Domain/Entities/ProfileObjState.cs
+++ b/src/WorkFlow.Domain/Entities/ProfileObjState.cs
@@ -82,8 +82,7 @@ public class ProfileObjState
     [ForeignKey("StateId")]
     public virtual State? State1 { get; set; }
 
-    [NotMapped]
-    public IEnumerable<string?> States => new List<string?>
+    public IEnumerable<string?> ToList() => new List<string?>
     {
         State1?.IntlState, State2, State3, State4
     };