diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 42857d23..71c63a9f 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -575,6 +575,8 @@ public class GepafinConstant {
     public static final String NDG_NOT_FOUND="ndg.not.found";
     public static final String EMAIL_PEC_REQUIRED="email.pec.cannot.null";
     public static final String USER_REQUEST_COMPLETED="user.request.completed";
+    public static final String END_DATE_GREATER_THAN_NOW="end.date.greater.than.now";
+
 }
 
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
index 509e9e51..d0bef93e 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
@@ -628,19 +628,19 @@ public class CallDao {
 		    if (dates.size() > 0) {
 		        setIfUpdated(callEntity::getStartDate, callEntity::setStartDate, dates.get(0));
 		    }
-		    if (dates.size() > 1) {
-				LocalDate requestEndDate = dates.get(1).toLocalDate(); // Extract only the date
-				LocalDate storedEndDate = callEntity.getEndDate().toLocalDate(); // Extract only the date
-
-				if (!requestEndDate.equals(storedEndDate)) { // Check if dates are different
-
-					setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, dates.get(1));
-//					callEntity.setStatus(CallStatusEnum.PUBLISH.getValue());
-//					callRepository.save(callEntity);
-					isEndDateUpdated = true;
-				}
-		    }
-		}
+//		    if (dates.size() > 1) {
+//				LocalDate requestEndDate = dates.get(1).toLocalDate(); // Extract only the date
+//				LocalDate storedEndDate = callEntity.getEndDate().toLocalDate(); // Extract only the date
+//
+//				if (!requestEndDate.equals(storedEndDate)) { // Check if dates are different
+//
+//					setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, dates.get(1));
+////					callEntity.setStatus(CallStatusEnum.PUBLISH.getValue());
+////					callRepository.save(callEntity);
+//					isEndDateUpdated = true;
+//				}
+//		    }
+//		}
 
 		if (updateCallRequest.getEndTime() != null) {
 			LocalTime requestEndTime = DateTimeUtil.parseTime(updateCallRequest.getEndTime());
@@ -653,6 +653,29 @@ public class CallDao {
 				isEndTimeUpdated = true;
 			}
 		}
+		if (dates.size() > 1) {
+			LocalDate requestEndDate = dates.get(1).toLocalDate(); // Extract only the date
+			LocalDate storedEndDate = callEntity.getEndDate().toLocalDate(); // Extract only the date
+
+			if (!requestEndDate.equals(storedEndDate)) {
+				// Check if dates are different
+
+				setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, dates.get(1));
+				if(callEntity.getStatus().equals(CallStatusEnum.EXPIRED.getValue())) {
+					LocalDateTime newEndDate = LocalDateTime.of(requestEndDate, callEntity.getEndTime());
+					if(newEndDate.isBefore(LocalDateTime.now())){
+						throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.END_DATE_GREATER_THAN_NOW));
+					}
+
+					if (requestEndDate.isAfter(LocalDate.now()) || requestEndDate.isEqual(LocalDate.now())) {
+						callEntity.setStatus(CallStatusEnum.PUBLISH.getValue());
+						callRepository.save(callEntity);
+					}
+				}
+				isEndDateUpdated = true;
+			}
+		}
+	}
 		if (isEndDateUpdated || isEndTimeUpdated) {
 			callRepository.save(callEntity);
 			loggingUtil.logUserAction(UserActionRequest.builder()
diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index a706e568..ad25a88b 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -411,3 +411,5 @@ user.action.id.not.found = User Action id not found.
 ndg.not.found=NDG not found.
 email.pec.cannot.null=Email pec is required.
 user.request.completed=User request completed successfully.
+end.date.greater.than.now=End date must be greater than the current date and time.
+
diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties
index f4246425..f98e55b8 100644
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -402,3 +402,5 @@ user.action.id.not.found = ID azione utente non trovato.
 ndg.not.found=NDG non trovato.
 email.pec.cannot.null=L'indirizzo email pec è obbligatorio.
 user.request.completed=Richiesta utente completata con successo.
+end.date.greater.than.now=La data di fine deve essere successiva alla data e all'ora correnti.
+