diff --git a/e2e/fixtures/wxr-simple.xml b/e2e/fixtures/wxr-simple.xml
index 39665352..ce7b5d64 100644
--- a/e2e/fixtures/wxr-simple.xml
+++ b/e2e/fixtures/wxr-simple.xml
@@ -56,6 +56,9 @@
 <p>Two roads diverged in a yellow wood,<br>And sorry I could not travel both</p>
 <!-- /wp:paragraph -->
 
+<!-- Test if self-closing blocks remain self-closing after URL rewriting. -->
+<!-- wp:navigation-link {"url":"https://playground.internal/path/one"} /-->
+
 <!-- wp:paragraph -->
 <p>
 <a href="https://playground.internal/path/one">One</a> seemed great, but <a href="https://playground.internal/path-not-taken">the other</a> seemed great too.
diff --git a/e2e/import-wxr.spec.js b/e2e/import-wxr.spec.js
index 8037cd1e..c37c549a 100644
--- a/e2e/import-wxr.spec.js
+++ b/e2e/import-wxr.spec.js
@@ -44,6 +44,9 @@ PARSERS.forEach((parser) => {
 <p>Two roads diverged in a yellow wood,<br>And sorry I could not travel both</p>
 <!-- /wp:paragraph -->
 
+<!-- Test if self-closing blocks remain self-closing after URL rewriting. -->
+<!-- wp:navigation-link {"url":"${PLAYGROUND_URL}/one"} /-->
+
 <!-- wp:paragraph -->
 <p>
 <a href="${PLAYGROUND_URL}/one">One</a> seemed great, but <a href="https://playground.internal/path-not-taken">the other</a> seemed great too.
@@ -213,6 +216,9 @@ test.describe('General tests', () => {
 <p>Two roads diverged in a yellow wood,<br>And sorry I could not travel both</p>
 <!-- /wp:paragraph -->
 
+<!-- Test if self-closing blocks remain self-closing after URL rewriting. -->
+<!-- wp:navigation-link {\"url\":\"https://playground.internal/path/one\"} /-->
+
 <!-- wp:paragraph -->
 <p>
 <a href="https://playground.internal/path/one">One</a> seemed great, but <a href="https://playground.internal/path-not-taken">the other</a> seemed great too.
diff --git a/src/php-toolkit/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php b/src/php-toolkit/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php
index 9e0f9267..96d7a8ac 100644
--- a/src/php-toolkit/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php
+++ b/src/php-toolkit/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php
@@ -496,7 +496,8 @@ private function block_attribute_updates_to_modifiable_text_updates() {
 			' ' .
 			$this->block_name .
 			' ' .
-			$encoded_attributes
+			$encoded_attributes .
+			( $this->is_self_closing_block() ? '/' : '' )
 		);
 
 		return true;