diff --git a/src/Middleware/RemoveQuotes.php b/src/Middleware/RemoveQuotes.php
index ce6ce7b..b5132bb 100644
--- a/src/Middleware/RemoveQuotes.php
+++ b/src/Middleware/RemoveQuotes.php
@@ -2,10 +2,14 @@
 
 namespace RenatoMarinho\LaravelPageSpeed\Middleware;
 
+use RenatoMarinho\LaravelPageSpeed\Entities\HtmlSpecs;
+
 class RemoveQuotes extends PageSpeed
 {
     public function apply($buffer)
     {
+        $buffer = $this->replaceInsideHtmlTags(HtmlSpecs::voidElements(), '/\/>/', '>', $buffer);
+
         $replace = [
             '/ src="(.\S*?)"/' => ' src=$1',
             '/ width="(.\S*?)"/' => ' width=$1',
@@ -16,7 +20,6 @@ public function apply($buffer)
             '/ border="(.\S*?)"/' => ' border=$1',
             '/ crossorigin="(.\S*?)"/' => ' crossorigin=$1',
             '/ type="(.\S*?)"/' => ' type=$1',
-            '/\/>/' => '>',
         ];
 
         return $this->replace($replace, $buffer);
diff --git a/tests/Boilerplate/index.html b/tests/Boilerplate/index.html
index 676e5ab..9633647 100644
--- a/tests/Boilerplate/index.html
+++ b/tests/Boilerplate/index.html
@@ -41,6 +41,12 @@
         <div style="background-image: url('img/test-bg.jpg');">
             <h1>Test Background Image</h1>
         </div>
+
+        <svg width="325" height="200" xmlns="http://www.w3.org/2000/svg">
+            <path d="M 80 80 A 45 45, 0, 0, 0, 125 125 L 125 80 Z" fill="green"/>
+            <path d="M 230 80 A 45 45, 0, 1, 0, 275 125 L 275 80 Z" fill="red"/>
+        </svg>
+
         <img src="http://emblemsbf.com/img/18346.jpg" width="250" style="height:300px; padding:10px" />
 
         <img src="tile whitespace.png" width="250" style="height:300px; padding:10px"/>
diff --git a/tests/Middleware/RemoveQuotesTest.php b/tests/Middleware/RemoveQuotesTest.php
index 2915611..d351c59 100644
--- a/tests/Middleware/RemoveQuotesTest.php
+++ b/tests/Middleware/RemoveQuotesTest.php
@@ -7,6 +7,15 @@
 
 class RemoveQuotesTest extends TestCase
 {
+    protected $response;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->response = $this->middleware->handle($this->request, $this->getNext());
+    }
+
     protected function getMiddleware()
     {
         $this->middleware = new RemoveQuotes();
@@ -14,15 +23,19 @@ protected function getMiddleware()
 
     public function testRemoveQuotes()
     {
-        $response = $this->middleware->handle($this->request, $this->getNext());
-
-        $this->assertStringContainsString('<link rel="apple-touch-icon" href="icon.png">', $response->getContent());
-        $this->assertStringContainsString('<meta charset=utf-8>', $response->getContent());
-        $this->assertStringContainsString('<meta name=viewport content="width=device-width, initial-scale=1">', $response->getContent());
-        $this->assertStringContainsString('<img src=http://emblemsbf.com/img/18346.jpg width=250 style="height:300px; padding:10px" >', $response->getContent());
-        $this->assertStringContainsString('<img src=/images/1000coin.png>', $response->getContent());
-        $this->assertStringContainsString('<vue-component :src="\'src\'" :type="\'type\'" :width="200"></vue-component>', $response->getContent());
-        $this->assertStringContainsString('<img src="tile whitespace.png" width=250 style="height:300px; padding:10px">', $response->getContent());
-        $this->assertStringContainsString('<input type=text name="name with spaces" value="name with spaces" width=100%>', $response->getContent());
+        $this->assertStringContainsString('<link rel="apple-touch-icon" href="icon.png">', $this->response->getContent());
+        $this->assertStringContainsString('<meta charset=utf-8>', $this->response->getContent());
+        $this->assertStringContainsString('<meta name=viewport content="width=device-width, initial-scale=1">', $this->response->getContent());
+        $this->assertStringContainsString('<img src=http://emblemsbf.com/img/18346.jpg width=250 style="height:300px; padding:10px" >', $this->response->getContent());
+        $this->assertStringContainsString('<img src=/images/1000coin.png>', $this->response->getContent());
+        $this->assertStringContainsString('<vue-component :src="\'src\'" :type="\'type\'" :width="200"></vue-component>', $this->response->getContent());
+        $this->assertStringContainsString('<img src="tile whitespace.png" width=250 style="height:300px; padding:10px">', $this->response->getContent());
+        $this->assertStringContainsString('<input type=text name="name with spaces" value="name with spaces" width=100%>', $this->response->getContent());
+    }
+
+    public function testWontRemoveTrailingSlashesOfNonVoidElements()
+    {
+        $this->assertStringContainsString('<path d="M 80 80 A 45 45, 0, 0, 0, 125 125 L 125 80 Z" fill="green"/>', $this->response->getContent());
+        $this->assertStringContainsString('<path d="M 230 80 A 45 45, 0, 1, 0, 275 125 L 275 80 Z" fill="red"/>', $this->response->getContent());
     }
 }