diff --git a/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs b/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs
index c41f8de2b..8b29545ce 100644
--- a/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs
+++ b/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs
@@ -58,9 +58,19 @@ namespace IRaCIS.Core.Application.Services
         public async Task<IResponseOutput> AddOrUpdateSystemBasicData(SystemBasicDataAddOrEdit addOrEditSystemBasicData)
         {
 
-            var entity = await _repository.InsertOrUpdateAsync<SystemBasicData, SystemBasicDataAddOrEdit>(addOrEditSystemBasicData, true);
-
-            return ResponseOutput.Ok(entity.Id.ToString());
+            if (addOrEditSystemBasicData.Id == null)
+            {
+                var entity = _mapper.Map<SystemBasicData>(addOrEditSystemBasicData);
+                await _systemBasicDataRepository.AddAsync(entity, true);
+                return ResponseOutput.Ok(entity.Id.ToString());
+            }
+            else
+            {
+                var entity = await _systemBasicDataRepository.Where(t => t.Id == addOrEditSystemBasicData.Id).FirstOrDefaultAsync();
+                _mapper.Map(addOrEditSystemBasicData, entity);
+                var success = await _repository.SaveChangesAsync();
+            }
+            return ResponseOutput.Ok(true);
         }