diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49f9a583fd..ba29e817b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -429,9 +429,6 @@ if (YUZU_USE_CPM)
         endif()
     endif()
 
-    # fmt
-    AddJsonPackage(fmt)
-
     # lz4
     AddJsonPackage(lz4)
 
@@ -473,8 +470,6 @@ if (YUZU_USE_CPM)
     endif()
 else()
     # Enforce the search mode of non-required packages for better and shorter failure messages
-    find_package(fmt 8 REQUIRED)
-
     if (NOT YUZU_DISABLE_LLVM)
         find_package(LLVM MODULE COMPONENTS Demangle)
     endif()
@@ -544,6 +539,7 @@ find_package(VulkanUtilityLibraries)
 find_package(SimpleIni)
 find_package(SPIRV-Tools)
 find_package(sirit)
+find_package(fmt)
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
diff --git a/cpmfile.json b/cpmfile.json
index e9e53ed326..957039c371 100644
--- a/cpmfile.json
+++ b/cpmfile.json
@@ -25,13 +25,6 @@
             "0003-armasm-options.patch"
         ]
     },
-    "fmt": {
-        "repo": "fmtlib/fmt",
-        "tag": "%VERSION%",
-        "hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
-        "version": "8",
-        "git_version": "12.0.0"
-    },
     "lz4": {
         "name": "lz4",
         "repo": "lz4/lz4",
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 434e6fb100..eb9a418ae8 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -39,6 +39,9 @@ if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
     AddJsonPackage(oaknut)
 endif()
 
+# fmt
+AddJsonPackage(fmt)
+
 # enet
 AddJsonPackage(enet)
 
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index aa3a97c128..e1ca354c78 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -198,5 +198,12 @@
         "key": "steamdeck",
         "bundled": true,
         "skip_updates": "true"
+    },
+    "fmt": {
+        "repo": "fmtlib/fmt",
+        "tag": "%VERSION%",
+        "hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
+        "version": "8",
+        "git_version": "12.0.0"
     }
 }