diff --git a/lib/coffee-script/repl.js b/lib/coffee-script/repl.js
index 14e5ab6d..53a8b0f1 100644
--- a/lib/coffee-script/repl.js
+++ b/lib/coffee-script/repl.js
@@ -185,7 +185,9 @@
         runInContext(opts.prelude, repl.context, 'prelude');
       }
       repl.on('exit', function() {
-        return repl.outputStream.write('\n');
+        if (!repl.rli.closed) {
+          return repl.outputStream.write('\n');
+        }
       });
       addMultilineHandler(repl);
       if (opts.historyFile) {
diff --git a/src/repl.coffee b/src/repl.coffee
index 7c859fb9..3a2e76f9 100644
--- a/src/repl.coffee
+++ b/src/repl.coffee
@@ -152,7 +152,7 @@ module.exports =
     opts = merge replDefaults, opts
     repl = nodeREPL.start opts
     runInContext opts.prelude, repl.context, 'prelude' if opts.prelude
-    repl.on 'exit', -> repl.outputStream.write '\n'
+    repl.on 'exit', -> repl.outputStream.write '\n' if not repl.rli.closed
     addMultilineHandler repl
     addHistory repl, opts.historyFile, opts.historyMaxInputSize if opts.historyFile
     # Adapt help inherited from the node REPL