diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index 8222dc8..1076ce4 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -144,13 +144,14 @@ namespace Marco.Pms.Model.Mapper
                 IsMandatory = checkList.IsMandatory,
             };
         }
-        public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto)
+        public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto,int tenantId)
         {
             return new ActivityCheckList
             {
                 Id = checkListDto.Id,
                 Check = checkListDto.Check,
-                IsMandatory = checkListDto.IsMandatory
+                IsMandatory = checkListDto.IsMandatory,
+                TenantId = tenantId
             };
         }
     }
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index b0cffaf..f1bb056 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -66,7 +66,7 @@ namespace Marco.Pms.Services.Controllers
                 List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
                 foreach (var check in createActivity.CheckList)
                 {
-                    ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto();
+                    ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId);
                     activityCheckList.Add(checkList);
                 }
                 _context.ActivityCheckLists.AddRange(activityCheckList);
@@ -89,7 +89,7 @@ namespace Marco.Pms.Services.Controllers
         {
             var tenantId = _userHelper.GetTenantId();
             var employee = await _userHelper.GetCurrentEmployeeAsync();
-            ActivityMaster? activity = await _context.ActivityMasters.FirstOrDefaultAsync(x => x.Id == id && x.IsActive == true);
+            ActivityMaster? activity = await _context.ActivityMasters.FirstOrDefaultAsync(x => x.Id == id && x.IsActive == true && x.TenantId == tenantId);
             if (activity != null && createActivity.UnitOfMeasurement != null && createActivity.ActivityName != null) {
 
                 activity.ActivityName = createActivity.ActivityName;
@@ -100,7 +100,7 @@ namespace Marco.Pms.Services.Controllers
                     List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
                     foreach (var check in createActivity.CheckList)
                     {
-                        ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto();
+                        ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId);
                         activityCheckList.Add(checkList);
                     }
                     _context.ActivityCheckLists.UpdateRange(activityCheckList);
diff --git a/Marco.Pms.Services/Program.cs b/Marco.Pms.Services/Program.cs
index 6719848..210c496 100644
--- a/Marco.Pms.Services/Program.cs
+++ b/Marco.Pms.Services/Program.cs
@@ -23,9 +23,6 @@ builder.Host.UseSerilog((context, config) =>
 })
 ;
 
-
-#region CORS Settings
-
 // Add services
 //builder.Services.AddCors(options =>
 //{