-

diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
index 3d21b55..fb0f7af 100644
--- a/core/src/main/java/org/jruby/Main.java
+++ b/core/src/main/java/org/jruby/Main.java
@@ -300,8 +300,11 @@ public class Main {
                 return doRunFromMain(runtime, in, filename);
             }
         } finally {
-            if (didTeardown.compareAndSet(false, true)) {
-                runtime.tearDown();
+            if (config.isHardExit()) {
+                // we're the command-line JRuby, and should shut down at exit
+                if (didTeardown.compareAndSet(false, true)) {
+                    runtime.tearDown();
+                }
             }
         }
     }