diff --git a/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Core/Entities/Organization.cs b/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Core/Entities/Organization.cs
index 97f74fa47..05ff15b83 100644
--- a/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Core/Entities/Organization.cs
+++ b/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Core/Entities/Organization.cs
@@ -20,13 +20,13 @@ public IEnumerable<Organization> SubOrganizations
             private set => _subOrganizations = new HashSet<Organization>(value);
         }
         
-        public Organization(Guid id, string name, IEnumerable<Organizer> organizers = null,
-            IEnumerable<Organization> subOrganizations = null)
+        public Organization(Guid id, string name, IEnumerable<Organizer> organizationOrganizers = null,
+            IEnumerable<Organization> organizations = null)
         {
             Id = id;
             Name = name;
-            Organizers = organizers ?? Enumerable.Empty<Organizer>();
-            SubOrganizations = subOrganizations ?? Enumerable.Empty<Organization>();
+            Organizers = organizationOrganizers ?? Enumerable.Empty<Organizer>();
+            SubOrganizations = organizations ?? Enumerable.Empty<Organization>();
         }
         
         public void AddOrganizer(Guid organizerId)
diff --git a/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/Extensions.cs b/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/Extensions.cs
index e76f3bb24..343da89eb 100644
--- a/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/Extensions.cs
+++ b/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/Extensions.cs
@@ -6,7 +6,7 @@ namespace MiniSpace.Services.Organizations.Infrastructure.Mongo.Documents
     public static class Extensions
     {
         public static Organization AsEntity(this OrganizationDocument document)
-            => new Organization(document.Id, document.Name, document.Organizers, document.SubOrganizations);
+            => new Organization(document.Id, document.Name, document.Organizers, document.SubOrganizations.Select(o => o.AsEntity()));
         
         public static OrganizationDocument AsDocument(this Organization entity)
             => new OrganizationDocument()
@@ -14,7 +14,7 @@ public static OrganizationDocument AsDocument(this Organization entity)
                 Id = entity.Id,
                 Name = entity.Name,
                 Organizers = entity.Organizers,
-                SubOrganizations = entity.SubOrganizations
+                SubOrganizations = entity.SubOrganizations.Select(o => o.AsDocument())
             };
         
         public static OrganizationDto AsDto(this OrganizationDocument document)
diff --git a/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/OrganizationDocument.cs b/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/OrganizationDocument.cs
index d021944d3..5e7a31dcb 100644
--- a/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/OrganizationDocument.cs
+++ b/MiniSpace.Services.Organizations/src/MiniSpace.Services.Organizations.Infrastructure/Mongo/Documents/OrganizationDocument.cs
@@ -8,6 +8,6 @@ public class OrganizationDocument: IIdentifiable<Guid>
         public Guid Id { get; set; }
         public string Name { get; set; }
         public IEnumerable<Organizer> Organizers { get; set; }
-        public IEnumerable<Organization> SubOrganizations { get; set; }
+        public IEnumerable<OrganizationDocument> SubOrganizations { get; set; }
     }
 }
\ No newline at end of file