diff --git a/.gitmodules b/.gitmodules
index 622b6a111bee..a6a192239d07 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,8 +68,8 @@
 	url = https://github.com/adafruit/nrfx.git
 [submodule "lib/tinyusb"]
 	path = lib/tinyusb
-	url = https://github.com/tannewt/tinyusb.git
-	branch = esp_fix
+	url = https://github.com/hathach/tinyusb.git
+	branch = master
 	fetchRecurseSubmodules = false
 [submodule "tools/huffman"]
 	path = tools/huffman
diff --git a/lib/tinyusb b/lib/tinyusb
index 00eb0144cbb1..ea64dd499961 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 00eb0144cbb11d1c37dcce5cd8ba8afe10e1b6b5
+Subproject commit ea64dd4999618ce14aea90118ee9218b4aefeba6