diff --git a/src/enveloped-signature.ts b/src/enveloped-signature.ts
index 5c74c362..d234bc5e 100644
--- a/src/enveloped-signature.ts
+++ b/src/enveloped-signature.ts
@@ -1,5 +1,6 @@
 import * as xpath from "xpath";
 import * as isDomNode from "@xmldom/is-dom-node";
+import { findChildren, isDescendantOf } from "./utils";
 
 import type {
   CanonicalizationOrTransformationAlgorithm,
@@ -26,10 +27,13 @@ export class EnvelopedSignature implements CanonicalizationOrTransformationAlgor
       return node;
     }
     const signatureNode = options.signatureNode;
-    const expectedSignatureValue = xpath.select1(
-      ".//*[local-name(.)='SignatureValue']/text()",
-      signatureNode,
-    );
+    if (isDescendantOf(signatureNode, node) && signatureNode.parentNode) {
+      signatureNode.parentNode.removeChild(signatureNode);
+      return node;
+    }
+    const signatureValueNode = findChildren(signatureNode, "SignatureValue")[0];
+    const expectedSignatureValue =
+      signatureValueNode && xpath.select1("text()", signatureValueNode);
     if (isDomNode.isTextNode(expectedSignatureValue)) {
       const expectedSignatureValueData = expectedSignatureValue.data;
 
diff --git a/src/signed-xml.ts b/src/signed-xml.ts
index 663d3d0e..5ba0a912 100644
--- a/src/signed-xml.ts
+++ b/src/signed-xml.ts
@@ -1048,10 +1048,15 @@ export class SignedXml {
       referenceNode.parentNode.insertBefore(signatureElem, referenceNode.nextSibling);
     }
 
-    // Now add all references (including any to the signature itself)
-    this.addAllReferences(doc, signatureElem, prefix);
-
+    const previousSignatureNode = this.signatureNode;
     this.signatureNode = signatureElem;
+    try {
+      this.addAllReferences(doc, signatureElem, prefix);
+    } catch (error) {
+      this.signatureNode = previousSignatureNode;
+      throw error;
+    }
+
     const signedInfoNodes = utils.findChildren(this.signatureNode, "SignedInfo");
     if (signedInfoNodes.length === 0) {
       const err3 = new Error("could not find SignedInfo element in the message");
@@ -1270,6 +1275,21 @@ export class SignedXml {
     options.signatureNode = this.signatureNode;
 
     const canonXml = node.cloneNode(true); // Deep clone
+    if (transforms.includes("http://www.w3.org/2000/09/xmldsig#enveloped-signature")) {
+      const signaturePath: number[] = [];
+      let signatureAncestor = this.signatureNode;
+      while (signatureAncestor?.parentNode && signatureAncestor !== node) {
+        signaturePath.push(
+          Array.from<Node>(signatureAncestor.parentNode.childNodes).indexOf(signatureAncestor),
+        );
+        signatureAncestor = signatureAncestor.parentNode;
+      }
+      if (signatureAncestor === node) {
+        options.signatureNode = signaturePath
+          .reverse()
+          .reduce((clonedNode, index) => clonedNode.childNodes[index], canonXml);
+      }
+    }
     let transformedXml: Node | string = canonXml;
 
     transforms.forEach((transformName) => {
diff --git a/test/canonicalization-unit-tests.spec.ts b/test/canonicalization-unit-tests.spec.ts
index 7a39f168..4bce8a6f 100644
--- a/test/canonicalization-unit-tests.spec.ts
+++ b/test/canonicalization-unit-tests.spec.ts
@@ -455,6 +455,26 @@ describe("Canonicalization unit tests", function () {
     expect(res).to.equal("<y/>");
   });
 
+  it("Enveloped-signature canonicalization preserves nested signatures when removing a direct child", function () {
+    const xml =
+      '<x xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><y><z><ds:Signature>NESTED</ds:Signature></z><ds:Signature>ENVELOPING</ds:Signature></y></x>';
+    const doc = new xmldom.DOMParser().parseFromString(xml);
+    const node = xpath.select1("/x/y", doc);
+    isDomNode.assertIsNodeLike(node);
+
+    const sig = new SignedXml();
+    const res = sig.getCanonXml(
+      [
+        "http://www.w3.org/2000/09/xmldsig#enveloped-signature",
+        "http://www.w3.org/2001/10/xml-exc-c14n#",
+      ],
+      node,
+    );
+    expect(res).to.equal(
+      '<y><z><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">NESTED</ds:Signature></z></y>',
+    );
+  });
+
   it("The XML canonicalization method processes a node-set by imposing the following additional document order rules on the namespace and attribute nodes of each element: \
     - An element's namespace and attribute nodes have a document order position greater than the element but less than any child node of the element. \
       Namespace nodes have a lesser document order position than attribute nodes. \
diff --git a/test/signature-integration-tests.spec.ts b/test/signature-integration-tests.spec.ts
index 02da0949..effc4e0b 100644
--- a/test/signature-integration-tests.spec.ts
+++ b/test/signature-integration-tests.spec.ts
@@ -223,4 +223,122 @@ describe("Signature integration tests", function () {
       "<library> should have two child nodes : <book> and <Signature>",
     ).to.equal(2);
   });
+
+  it("should create valid signature when signature location is nested in child element", function () {
+    const xml = "<root><child/></root>";
+
+    const sig = new SignedXml();
+    sig.privateKey = fs.readFileSync("./test/static/client.pem");
+    sig.addReference({
+      xpath: "/*",
+      transforms: [
+        "http://www.w3.org/2000/09/xmldsig#enveloped-signature",
+        "http://www.w3.org/2001/10/xml-exc-c14n#",
+      ],
+      digestAlgorithm: "http://www.w3.org/2001/04/xmlenc#sha256",
+    });
+    sig.canonicalizationAlgorithm = "http://www.w3.org/2001/10/xml-exc-c14n#";
+    sig.signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
+
+    sig.computeSignature(xml, {
+      location: { action: "append", reference: "//*[local-name()='child']" },
+    });
+
+    const signedXml = sig.getSignedXml();
+
+    const doc = new xmldom.DOMParser().parseFromString(signedXml);
+    const signatureNode = xpath.select1("//*[local-name(.)='Signature']", doc);
+    isDomNode.assertIsNodeLike(signatureNode);
+
+    const verifier = new SignedXml();
+    verifier.publicCert = fs.readFileSync("./test/static/client_public.pem");
+    verifier.loadSignature(signatureNode);
+
+    expect(verifier.checkSignature(signedXml)).to.be.true;
+  });
+
+  it("should still verify a loaded signature after signing another document fails", function () {
+    const signedXml = fs.readFileSync("./test/static/valid_signature.xml", "utf8");
+    const doc = new xmldom.DOMParser().parseFromString(signedXml);
+    const signature = xpath.select1(
+      "//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']",
+      doc,
+    );
+    isDomNode.assertIsNodeLike(signature);
+    const sig = new SignedXml({
+      privateKey: fs.readFileSync("./test/static/client.pem"),
+      publicCert: fs.readFileSync("./test/static/client_public.pem"),
+    });
+    sig.loadSignature(signature);
+    expect(sig.checkSignature(signedXml)).to.be.true;
+
+    expect(() => sig.computeSignature("<other/>")).to.throw();
+
+    expect(sig.checkSignature(signedXml)).to.be.true;
+  });
+
+  for (const location of ["/root", "/root/container"]) {
+    describe(`when appending a parent signature to ${location}`, function () {
+      const privateKey = fs.readFileSync("./test/static/client.pem");
+      const publicCert = fs.readFileSync("./test/static/client_public.pem");
+      const select = xpath.useNamespaces({ ds: "http://www.w3.org/2000/09/xmldsig#" });
+      let signedXml: string;
+      let doc: Document;
+      let parentSignatureXml: string;
+
+      const createSigner = (reference: string) => {
+        const signer = new SignedXml({
+          privateKey,
+          canonicalizationAlgorithm: "http://www.w3.org/2001/10/xml-exc-c14n#",
+          signatureAlgorithm: "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256",
+        });
+        signer.addReference({
+          xpath: reference,
+          transforms: [
+            "http://www.w3.org/2000/09/xmldsig#enveloped-signature",
+            "http://www.w3.org/2001/10/xml-exc-c14n#",
+          ],
+          digestAlgorithm: "http://www.w3.org/2001/04/xmlenc#sha256",
+        });
+        return signer;
+      };
+
+      beforeEach(function () {
+        const childSigner = createSigner("/root/child");
+        childSigner.computeSignature(
+          '<root Id="parent"><child Id="child"><value>data</value></child><container/></root>',
+          { location: { reference: "/root/child", action: "append" } },
+        );
+
+        const parentSigner = createSigner("/root");
+        parentSigner.computeSignature(childSigner.getSignedXml(), {
+          prefix: "ds",
+          location: { reference: location, action: "append" },
+        });
+        signedXml = parentSigner.getSignedXml();
+        doc = new xmldom.DOMParser().parseFromString(signedXml);
+        parentSignatureXml = parentSigner.getSignatureXml();
+      });
+
+      it("should preserve the validity of the child and parent signatures", function () {
+        for (const reference of ["/root/child", location]) {
+          const signature = select(`${reference}/ds:Signature`, doc, true);
+          isDomNode.assertIsNodeLike(signature);
+          const verifier = new SignedXml({ publicCert });
+          verifier.loadSignature(signature);
+          expect(verifier.checkSignature(signedXml), `signature at ${reference}`).to.be.true;
+        }
+      });
+
+      it("should reject the parent signature when the child signature is tampered with", function () {
+        const childSignatureValue = select("/root/child/ds:Signature/ds:SignatureValue", doc, true);
+        isDomNode.assertIsElementNode(childSignatureValue);
+        childSignatureValue.textContent = "tampered";
+        const parentVerifier = new SignedXml({ publicCert });
+        parentVerifier.loadSignature(parentSignatureXml);
+        expect(parentVerifier.checkSignature(doc.toString())).to.be.false;
+        expect(parentVerifier.getSignedReferences()).to.be.empty;
+      });
+    });
+  }
 });