diff --git a/.eslintignore b/.eslintignore
index 08396583..61d2a0b7 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,7 @@
 .vscode
-/node_modules
-/examples
+/coverage
 /docs/lib
+/examples
 /mithril.js
 /mithril.min.js
+/node_modules
diff --git a/stream/stream.js b/stream/stream.js
index 7e9b2e8c..18c7e608 100644
--- a/stream/stream.js
+++ b/stream/stream.js
@@ -16,7 +16,7 @@ function createStream() {
 }
 function initStream(stream) {
 	stream.constructor = createStream
-	stream._state = {id: guid++, value: undefined, state: 0, derive: undefined, recover: undefined, deps: {}, parents: [], endStream: undefined}
+	stream._state = {id: guid++, value: undefined, state: 0, derive: undefined, recover: undefined, deps: {}, parents: [], endStream: undefined, unregister: undefined}
 	stream.map = stream["fantasy-land/map"] = map, stream["fantasy-land/ap"] = ap, stream["fantasy-land/of"] = createStream
 	stream.valueOf = valueOf, stream.toJSON = toJSON, stream.toString = valueOf
 
@@ -25,7 +25,10 @@ function initStream(stream) {
 			if (!stream._state.endStream) {
 				var endStream = createStream()
 				endStream.map(function(value) {
-					if (value === true) unregisterStream(stream), unregisterStream(endStream)
+					if (value === true) {
+						unregisterStream(stream)
+						endStream._state.unregister = function(){unregisterStream(endStream)}
+					}
 					return value
 				})
 				stream._state.endStream = endStream
@@ -37,6 +40,7 @@ function initStream(stream) {
 function updateStream(stream, value) {
 	updateState(stream, value)
 	for (var id in stream._state.deps) updateDependency(stream._state.deps[id], false)
+	if (stream._state.unregister != null) stream._state.unregister()
 	finalize(stream)
 }
 function updateState(stream, value) {
diff --git a/stream/tests/test-stream.js b/stream/tests/test-stream.js
index 89dd713a..09b01209 100644
--- a/stream/tests/test-stream.js
+++ b/stream/tests/test-stream.js
@@ -263,6 +263,18 @@ o.spec("stream", function() {
 
 			o(doubled()).equals(4)
 		})
+		o("end stream can be mapped to", function() {
+			var stream = Stream()
+			var spy = o.spy()
+
+			stream.end.map(spy)
+
+			o(spy.callCount).equals(0)
+
+			stream.end(true)
+
+			o(spy.callCount).equals(1)
+		})
 	})
 	o.spec("valueOf", function() {
 		o("works", function() {