diff --git a/src/bind.ts b/src/bind.ts
index 6b4dc64b..fe6d91af 100644
--- a/src/bind.ts
+++ b/src/bind.ts
@@ -46,6 +46,7 @@ export function listenForBind(el: Node = document): Subscription {
       return closed
     },
     unsubscribe() {
+      if (closed) return
       closed = true
       observers.delete(el)
       observer.disconnect()
diff --git a/test/bind.ts b/test/bind.ts
index 1047aca0..4e89c8cc 100644
--- a/test/bind.ts
+++ b/test/bind.ts
@@ -1,7 +1,7 @@
 import {expect, fixture, html} from '@open-wc/testing'
 import {fake} from 'sinon'
 import {controller} from '../src/controller.js'
-import {bindShadow} from '../src/bind.js'
+import {bindShadow, listenForBind} from '../src/bind.js'
 
 describe('Actionable', () => {
   @controller
@@ -28,6 +28,43 @@ describe('Actionable', () => {
       <div id="el6" data-action="click:bind-test#foo"></div>`)
   })
 
+  it('keeps a new subscription cached when an old subscription is unsubscribed again', () => {
+    const root = document.createElement('div')
+    const old = listenForBind(root)
+    old.unsubscribe()
+    const current = listenForBind(root)
+    old.unsubscribe()
+    const reused = listenForBind(root)
+    try {
+      expect(old.closed).to.equal(true)
+      expect(current.closed).to.equal(false)
+      expect(reused === current).to.equal(true)
+    } finally {
+      current.unsubscribe()
+      reused.unsubscribe()
+    }
+  })
+
+  it('does not leave an observer binding actions after the current subscription is closed', async () => {
+    const root = instance.attachShadow({mode: 'open'})
+    const old = listenForBind(root)
+    old.unsubscribe()
+    const current = listenForBind(root)
+    old.unsubscribe()
+    const reused = listenForBind(root)
+    reused.unsubscribe()
+    try {
+      const button = document.createElement('button')
+      button.setAttribute('data-action', 'click:bind-test#foo')
+      root.append(button)
+      await Promise.resolve()
+      button.click()
+      expect(instance.foo.callCount).to.equal(0)
+    } finally {
+      current.unsubscribe()
+    }
+  })
+
   it('binds events on elements based on their data-action attribute', () => {
     expect(instance.foo).to.have.callCount(0)
     instance.querySelector<HTMLElement>('#el1')!.click()