diff --git a/TIAM.Entities/ServiceProviders/Company.cs b/TIAM.Entities/ServiceProviders/Company.cs
index e130c36c..cbfc1a38 100644
--- a/TIAM.Entities/ServiceProviders/Company.cs
+++ b/TIAM.Entities/ServiceProviders/Company.cs
@@ -28,7 +28,7 @@ public class Company : AcCompany<User, UserToCompany, Profile>, ICompany<User, U
     {
     }
 
-    public Company(Guid id, string name, Guid ownerId, Guid affiliateId) : base(id, name, ownerId, affiliateId)
+    public Company(Guid id, string name, Guid? ownerId, Guid affiliateId) : base(id, name, ownerId, affiliateId)
     {
     }
 }
\ No newline at end of file
diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
index 734b3e5f..c18a023a 100644
--- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
+++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
@@ -46,10 +46,10 @@ namespace TIAMWebApp.Server.Controllers
                     var id = Guid.NewGuid();
                     var name = serviceProvider.Name;
                     var commissionRate = serviceProvider.CommissionPercent;
-                    Guid ownerId;
 
+                    
                     //no owner set yet
-                    ownerId = serviceProvider.OwnerId == Guid.Empty ? serviceProvider.OwnerId : serviceProvider.OwnerId;
+                    var ownerId = serviceProvider.OwnerId == Guid.Empty ? null : serviceProvider.OwnerId;
 
                     if (name is null)
                     {
diff --git a/TIAMWebApp/Shared/Models/ServiceProviderModel.cs b/TIAMWebApp/Shared/Models/ServiceProviderModel.cs
index 99f724ac..fce13b92 100644
--- a/TIAMWebApp/Shared/Models/ServiceProviderModel.cs
+++ b/TIAMWebApp/Shared/Models/ServiceProviderModel.cs
@@ -10,10 +10,10 @@ namespace TIAMWebApp.Shared.Application.Models
     {
         public Guid Id { get; set; }
         public string? Name { get; set; }
-        public Guid OwnerId { get; set; }
+        public Guid? OwnerId { get; set; }
         public int CommissionPercent { get; set; }
         public ServiceProviderModel() { }
-        public ServiceProviderModel(Guid id, string name, Guid ownerId, int commissionPercent)
+        public ServiceProviderModel(Guid id, string name, Guid? ownerId, int commissionPercent)
         {
             Id = id;
             Name = name;