diff --git a/xP/public/xP.js b/xP/public/xP.js
index aabf75a..a7b7b11 100644
--- a/xP/public/xP.js
+++ b/xP/public/xP.js
@@ -566,12 +566,6 @@ let Topic = {
 }
 
 let Buffer = {
-	controller: new AbortController(),
-
-	onbeforeremove: vnode => {
-		Buffer.controller.abort()
-	},
-
 	onupdate: vnode => {
 		if (bufferAutoscroll)
 			vnode.dom.scrollTop = vnode.dom.scrollHeight
@@ -579,8 +573,14 @@ let Buffer = {
 
 	oncreate: vnode => {
 		Buffer.onupdate(vnode)
+
+		vnode.state.controller = new AbortController()
 		window.addEventListener('resize', event => Buffer.onupdate(vnode),
-			{signal: Buffer.controller.signal})
+			{signal: vnode.state.controller.signal})
+	},
+
+	onremove: vnode => {
+		vnode.state.controller.abort()
 	},
 
 	view: vnode => {