diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
index 8f77baff..03f8f83a 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
@@ -55,7 +55,7 @@ public class AssignedApplicationsDao {
         }
         UserEntity user = userService.validateUser(userId);
         AssignedApplicationsEntity assignment = createAssignmentEntity(application, user.getId(), assignedByUser, assignedApplicationsRequest);
-        AssignedApplicationsResponse assignApplicationToInstructorResponse = convertEntityToResponse(assignment, assignedApplicationsRequest);
+        AssignedApplicationsResponse assignApplicationToInstructorResponse = convertEntityToResponse(assignment);
 
         log.info("Application assigned succesfully {}", assignApplicationToInstructorResponse);
         return assignApplicationToInstructorResponse;
@@ -66,7 +66,10 @@ public class AssignedApplicationsDao {
         assignApplication.setApplication(application);
         assignApplication.setAssignedBy(assignedByUser.getId());
         assignApplication.setUserId(userId);
-        assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue());
+        assignApplication.setStatus(AssignedApplicationEnum.ASSIGNED.getValue());
+        if(assignedApplicationsRequest.getStatus() != null) {
+        	 assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue());
+        }
         assignApplication.setNote(assignedApplicationsRequest.getNote());
         assignApplication.setIsDeleted(false);
         assignApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
@@ -79,7 +82,7 @@ public class AssignedApplicationsDao {
         return assignedApplication;
     }
 
-    public AssignedApplicationsResponse convertEntityToResponse(AssignedApplicationsEntity application, AssignedApplicationsRequest assignedApplicationsRequest){
+    public AssignedApplicationsResponse convertEntityToResponse(AssignedApplicationsEntity application){
         AssignedApplicationsResponse assignedApplicationsResponse = new AssignedApplicationsResponse();
         assignedApplicationsResponse.setId(application.getId());
         assignedApplicationsResponse.setApplicationId(application.getApplication().getId());
@@ -111,7 +114,7 @@ public class AssignedApplicationsDao {
             Specification<AssignedApplicationsEntity> spec = search(userId);
             List<AssignedApplicationsEntity> assignedApplicationsEntityList = assignedApplicationsRepository.findAll(spec);
             return assignedApplicationsEntityList.stream()
-                    .map(entity -> convertEntityToResponse(entity, new AssignedApplicationsRequest()))
+                    .map(entity -> convertEntityToResponse(entity))
                     .collect(Collectors.toList());
         }
         private Specification<AssignedApplicationsEntity> search(Long userId) {
@@ -138,7 +141,7 @@ public class AssignedApplicationsDao {
         existingAssignment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
 
         AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(existingAssignment);
-        AssignedApplicationsResponse response = convertEntityToResponse(updatedAssignment, updateRequest);
+        AssignedApplicationsResponse response = convertEntityToResponse(updatedAssignment);
         log.info("Assigned application updated successfully: {}", response);
         return response;
     }
@@ -146,7 +149,7 @@ public class AssignedApplicationsDao {
     public AssignedApplicationsResponse getAssignedApplicationById(Long id) {
         log.info("Fetching assigned application with ID: {}", id);
         AssignedApplicationsEntity assignedApplication = validateAssignedApplication(id);
-        AssignedApplicationsResponse response = convertEntityToResponse(assignedApplication, new AssignedApplicationsRequest());
+        AssignedApplicationsResponse response = convertEntityToResponse(assignedApplication);
         log.info("Assigned application fetched successfully: {}", response);
         return response;
     }