diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
index e4b20a3c..8577223f 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
@@ -163,7 +163,7 @@ public class TaskLifecycleListener implements ApplicationListener<ApplicationEve
 			taskRepository.completeTaskExecution(taskExecution.getExecutionId(), taskExecution.getExitCode(),
 					taskExecution.getEndTime(), taskExecution.getExitMessage());
 
-			if(this.closeContext) {
+			if(this.closeContext && this.context.isActive()) {
 				this.context.close();
 			}
 		}