diff --git a/.gitmodules b/.gitmodules
index 93ba9b930d..a0a89933df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -27,7 +27,7 @@
     url = https://github.com/ReinUsesLisp/sirit
 [submodule "mbedtls"]
     path = externals/mbedtls
-    url = https://github.com/DarkLordZach/mbedtls
+    url = https://github.com/yuzu-emu/mbedtls
 [submodule "libzip"]
     path = externals/libzip/libzip
     url = https://github.com/nih-at/libzip.git
diff --git a/externals/mbedtls b/externals/mbedtls
index a280e602f3..eac2416b8f 160000
--- a/externals/mbedtls
+++ b/externals/mbedtls
@@ -1 +1 @@
-Subproject commit a280e602f3a4ae001d3a83cbc3e6e04c99c22277
+Subproject commit eac2416b8fdb2cb9c867a538100bf95326bad75b
diff --git a/src/core/crypto/aes_util.cpp b/src/core/crypto/aes_util.cpp
index 6a97348122..cb7506241b 100644
--- a/src/core/crypto/aes_util.cpp
+++ b/src/core/crypto/aes_util.cpp
@@ -105,8 +105,6 @@ void AESCipher<Key, KeySize>::Transcode(const u8* src, std::size_t size, u8* des
             }
         }
     }
-
-    mbedtls_cipher_finish(context, nullptr, nullptr);
 }
 
 template <typename Key, std::size_t KeySize>