diff --git a/src/main/java/org/springframework/shell/core/JLineShellComponent.java b/src/main/java/org/springframework/shell/core/JLineShellComponent.java
index a54c8671..5230b69f 100644
--- a/src/main/java/org/springframework/shell/core/JLineShellComponent.java
+++ b/src/main/java/org/springframework/shell/core/JLineShellComponent.java
@@ -78,8 +78,10 @@ public class JLineShellComponent extends JLineShell implements Lifecycle {
 
 
 	public void stop() {
-		closeShell();
-		running = false;
+		if (running) {
+			closeShell();
+			running = false;
+		}
 	}
 
 	public boolean isRunning() {