diff --git a/src/component/component.ts b/src/component/component.ts
index bda72e5f..c8b350bd 100644
--- a/src/component/component.ts
+++ b/src/component/component.ts
@@ -451,6 +451,7 @@ export class Component<T extends Env, Props extends {}> {
       }
     }
     __owl__.isMounted = true;
+    __owl__.currentFiber = null;
     try {
       this.mounted();
       if (__owl__.mountedCB) {
@@ -526,7 +527,6 @@ export class Component<T extends Env, Props extends {}> {
     const __owl__ = this.__owl__;
     const target = __owl__.vnode || document.createElement(vnode.sel!);
     __owl__.vnode = patch(target, vnode);
-    __owl__.currentFiber = null;
   }
 
   /**
diff --git a/src/component/fiber.ts b/src/component/fiber.ts
index 8bf3f91c..fab98f70 100644
--- a/src/component/fiber.ts
+++ b/src/component/fiber.ts
@@ -163,6 +163,7 @@ export class Fiber {
       const fiber = patchQueue[i];
       component = fiber.component;
       component.__patch(fiber.vnode);
+      component.__owl__.currentFiber = null;
     }
     try {
       for (let i = patchLen - 1; i >= 0; i--) {
diff --git a/tests/component/component.test.ts b/tests/component/component.test.ts
index 28c4f34b..ecbb32b4 100644
--- a/tests/component/component.test.ts
+++ b/tests/component/component.test.ts
@@ -4889,6 +4889,37 @@ describe("unmounting and remounting", () => {
     await widget.mount(fixture);
     expect(fixture.innerHTML).toBe("<div>3</div>");
   });
+
+  test("sub component is still active after being  unmounted and remounted", async () => {
+    class Child extends Component<any, any> {
+      static template = xml`
+        <p t-on-click="state.value++">
+          <t t-esc="state.value"/>
+        </p>`;
+
+      state = useState({ value: 1 });
+    }
+
+    class Parent extends Component<any, any> {
+      static components = { Child };
+      static template = xml`<div><Child/></div>`;
+    }
+
+    const w = new Parent();
+    await w.mount(fixture);
+    expect(fixture.innerHTML).toBe("<div><p>1</p></div>");
+
+    fixture.querySelector("p")!.click();
+    await nextTick();
+    expect(fixture.innerHTML).toBe("<div><p>2</p></div>");
+    w.unmount();
+    await nextTick();
+    await w.mount(fixture);
+    expect(fixture.innerHTML).toBe("<div><p>2</p></div>");
+    fixture.querySelector("p")!.click();
+    await nextTick();
+    expect(fixture.innerHTML).toBe("<div><p>3</p></div>");
+  });
 });
 
 describe("dynamic root nodes", () => {