diff --git a/overlay/src/main.cpp b/overlay/src/main.cpp
index 66c8453..777b8dc 100644
--- a/overlay/src/main.cpp
+++ b/overlay/src/main.cpp
@@ -114,6 +114,7 @@ class GuiToggle final : public tsl::Gui {
         list->addItem(config_es1.create_list_item("es1"));
         list->addItem(config_es2.create_list_item("es2"));
         list->addItem(config_es3.create_list_item("es3"));
+        list->addItem(config_es4.create_list_item("es4"));
 
         list->addItem(new tsl::elm::CategoryHeader("NIFM - 010000000000000F"));
         list->addItem(config_ctest.create_list_item("ctest"));
@@ -144,6 +145,7 @@ class GuiToggle final : public tsl::Gui {
     ConfigEntry config_es1{"es", "es1", true};
     ConfigEntry config_es2{"es", "es2", true};
     ConfigEntry config_es3{"es", "es3", true};
+    ConfigEntry config_es4{"es", "es4", true};
     ConfigEntry config_ctest{"nifm", "ctest", true};
     ConfigEntry config_ctest2{"nifm", "ctest2", true};
     ConfigEntry config_ctest3{"nifm", "ctest3", true};
diff --git a/sysmod/src/main.cpp b/sysmod/src/main.cpp
index 7dea935..27a3d61 100644
--- a/sysmod/src/main.cpp
+++ b/sysmod/src/main.cpp
@@ -284,7 +284,8 @@ constinit Patterns ldr_patterns[] = {
 constinit Patterns es_patterns[] = {
     { "es1", "0x..00.....e0.0091..0094..4092...d1", 16, 0, and_cond, mov0_patch, mov0_applied, true, FW_VER_ANY, MAKEHOSVERSION(1,0,0) },
     { "es2", "0x..00.....e0.0091..0094..4092...a9", 16, 0, and_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(2,0,0), MAKEHOSVERSION(8,1,1) },
-    { "es3", "0x..00...0094a0..d1..ff97.......a9", 16, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(9,0,0), FW_VER_ANY }, //9.0.0 - 19.0.0+
+    { "es3", "0x..00...0094a0..d1..ff97.......a9", 16, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(9,0,0), MAKEHOSVERSION(20,5,0) }, //9.0.0 - 20.5.0
+	{ "es4", "0x..00....97a0..d1...97e003132a...a9", 16, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(9,0,0), FW_VER_ANY } }, //21.0.0+
 };
 
 constinit Patterns nifm_patterns[] = {