diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs
index d7ce8714..d5aa7eac 100644
--- a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs
+++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs
@@ -420,15 +420,21 @@ namespace BMA.EHR.Insignia.Service.Controllers
             var insigniaNoteProfile = await _context.InsigniaNoteProfiles.AsQueryable()
                             .Include(x => x.RequestInsignia)
                             .Include(x => x.InsigniaNote)
+                            .Include(x => x.Profile)
                             .FirstOrDefaultAsync(x => x.Id == req.InsigniaNoteProfileId);
             if (insigniaNoteProfile == null)
                 return Error(GlobalMessages.InsigniaRequestProfileNotFound);
             if (insigniaNoteProfile.Status != "DONE")
                 return Error(GlobalMessages.InsigniaNoBorrow);
 
+            var _organization = await _context.Organizations.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Id == insigniaNoteProfile.Profile.OcId);
+            if (_organization == null)
+                return Error(GlobalMessages.OrganizationNotFound);
+
             var organization = await _context.Organizations.AsQueryable()
                             .Include(x => x.OrganizationOrganization)
-                            .FirstOrDefaultAsync(x => x.Id == insigniaNoteProfile.Profile.OcId);
+                            .FirstOrDefaultAsync(x => x.Id == _organization.OrganizationAgencyId);
             if (organization == null)
                 return Error(GlobalMessages.OrganizationNotFound);