diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index 633c8429..8cc7d486 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -234,6 +234,7 @@
         {
             _companyToSetOwner.OwnerId = userModelDto.Id;
             var result = await serviceProviderDataService.UpdateServiceProviderAsync(_companyToSetOwner);
+            _setOwnerPopupVisible = false;
             _companyToSetOwner = null;
             return result;
         }
@@ -318,8 +319,9 @@
         _logger.Detail($"OnProductGridItemSaving");
 
         var company = _productDetailGridComponent!.ParentData as Company;
-        if (company == null || company.OwnerId.IsNullOrEmpty())
+        if (company == null || company.OwnerId.IsNullOrEmpty())        
         {
+            e.Cancel = true;
             _logger.Error($"OnProductGridItemSaving; company == null || company.OwnerId.IsNullOrEmpty(); company.OwnerId: {company?.OwnerId}");
             return;
         }