diff --git a/dist/dde-with-signals.js b/dist/dde-with-signals.js
index d5a5536..f18a40d 100644
--- a/dist/dde-with-signals.js
+++ b/dist/dde-with-signals.js
@@ -557,16 +557,18 @@ var st = {
 };
 function ut(t, e, ...r) {
 	let { current: n } = x;
-	n.prevent || n.host(function(o) {
-		o[D] || (o[D] = [], _.disconnected(
+	n.host(function(o) {
+		if (o[D])
+			return o[D].push([[t, e], ...r]);
+		o[D] = [], !n.prevent && _.disconnected(
 			() => (
 				/*!
-				* Clears all Signals listeners added in the current scope/host (`S.el`, `assign`, …?).
-				* You can investigate the `__dde_reactive` key of the element.
-				* */
+					* Clears all Signals listeners added in the current scope/host (`S.el`, `assign`, …?).
+					* You can investigate the `__dde_reactive` key of the element.
+					* */
 				o[D].forEach(([[c, u]]) => R(c, u, c[l] && c[l].host && c[l].host() === o))
 			)
-		)(o)), o[D].push([[t, e], ...r]);
+		)(o);
 	});
 }
 function it(t, e, r) {
diff --git a/dist/esm-with-signals.js b/dist/esm-with-signals.js
index ce3b734..dc37c58 100644
--- a/dist/esm-with-signals.js
+++ b/dist/esm-with-signals.js
@@ -555,16 +555,18 @@ var st = {
 };
 function ut(t, e, ...r) {
 	let { current: n } = x;
-	n.prevent || n.host(function(o) {
-		o[D] || (o[D] = [], _.disconnected(
+	n.host(function(o) {
+		if (o[D])
+			return o[D].push([[t, e], ...r]);
+		o[D] = [], !n.prevent && _.disconnected(
 			() => (
 				/*!
-				* Clears all Signals listeners added in the current scope/host (`S.el`, `assign`, …?).
-				* You can investigate the `__dde_reactive` key of the element.
-				* */
+					* Clears all Signals listeners added in the current scope/host (`S.el`, `assign`, …?).
+					* You can investigate the `__dde_reactive` key of the element.
+					* */
 				o[D].forEach(([[c, u]]) => R(c, u, c[l] && c[l].host && c[l].host() === o))
 			)
-		)(o)), o[D].push([[t, e], ...r]);
+		)(o);
 	});
 }
 function it(t, e, r) {
diff --git a/src/signals-lib.js b/src/signals-lib.js
index 1fbae47..caddcfe 100644
--- a/src/signals-lib.js
+++ b/src/signals-lib.js
@@ -92,6 +92,8 @@ import { enviroment as env } from "./dom-common.js";
 import { el } from "./dom.js";
 import { scope } from "./dom.js";
 // TODO: third argument for handle `cache_tmp` in re-render
+// TODO: clear cache on disconnect
+// TODO: extract cache to separate (exportable) function
 signal.el= function(s, map){
 	const mark_start= el.mark({ type: "reactive" }, true);
 	const mark_end= mark_start.end;
@@ -191,20 +193,19 @@ export const signals_config= {
 };
 function removeSignalsFromElements(s, listener, ...notes){
 	const { current }= scope;
-	if(current.prevent) return;
 	current.host(function(element){
-		if(!element[key_reactive]){
-			element[key_reactive]= [];
-			on.disconnected(()=>
-				/*!
-				 * Clears all Signals listeners added in the current scope/host (`S.el`, `assign`, …?).
-				 * You can investigate the `__dde_reactive` key of the element.
-				 * */
-				element[key_reactive].forEach(([ [ s, listener ] ])=>
-					removeSignalListener(s, listener, s[mark] && s[mark].host && s[mark].host() === element))
-			)(element);
-		}
-		element[key_reactive].push([ [ s, listener ], ...notes ]);
+		if(element[key_reactive])
+			return element[key_reactive].push([ [ s, listener ], ...notes ]);
+		element[key_reactive]= [];
+		if(current.prevent) return; // typically document.body, doenst need auto-remove as it should happen on page leave
+		on.disconnected(()=>
+			/*!
+				* Clears all Signals listeners added in the current scope/host (`S.el`, `assign`, …?).
+				* You can investigate the `__dde_reactive` key of the element.
+				* */
+			element[key_reactive].forEach(([ [ s, listener ] ])=>
+				removeSignalListener(s, listener, s[mark] && s[mark].host && s[mark].host() === element))
+		)(element);
 	});
 }