diff --git a/assets/js/phoenix_live_view/dom_patch.js b/assets/js/phoenix_live_view/dom_patch.js
index 2b51ab3c11..b5b82c0a4c 100644
--- a/assets/js/phoenix_live_view/dom_patch.js
+++ b/assets/js/phoenix_live_view/dom_patch.js
@@ -219,6 +219,10 @@ export default class DOMPatch {
           DOM.maybeAddPrivateHooks(toEl, phxViewportTop, phxViewportBottom)
           DOM.cleanChildNodes(toEl, phxUpdate)
           if(this.skipCIDSibling(toEl)){
+            // track inputs for applying phx-no-feedback, even if an element and
+            // its children are skipped
+            DOM.all(fromEl, "form", (form) => trackedForms.add(form))
+            if(fromEl.tagName === "FORM") trackedForms.add(fromEl)
             // if this is a live component used in a stream, we may need to reorder it
             this.maybeReOrderStream(fromEl)
             return false