diff --git a/packages/jelos/sources/scripts/runemu.sh b/packages/jelos/sources/scripts/runemu.sh
index cde933a48..ae57ba083 100755
--- a/packages/jelos/sources/scripts/runemu.sh
+++ b/packages/jelos/sources/scripts/runemu.sh
@@ -96,10 +96,8 @@ fi
 if [ $(get_setting "maxperf" "${PLATFORM}" "${ROMNAME##*/}") == "0" ]
 then
   normperf &
-  EMUPERF="${SLOW_CORES}"
 else
   maxperf &
-  EMUPERF="${FAST_CORES}"
 fi
 
 ### Set the cores to use
@@ -115,14 +113,27 @@ else
   unset EMUPERF
 fi
 
+### We need the original system cooling profile later so get it now!
+COOLINGPROFILE=$(get_setting cooling.profile)
+
 ### Set the overclock mode
 OVERCLOCK=$(get_setting "overclock" "${PLATFORM}" "${ROMNAME##*/}")
-COOLINGPROFILE=$(get_setting cooling.profile)
 if [ ! -z "${OVERCLOCK}" ]
 then
   /usr/bin/overclock ${OVERCLOCK}
 fi
 
+if [ "${DEVICE_HAS_FAN}" = "true" ]
+then
+  ### Set any custom fan profile (make this better!)
+  GAMEFAN=$(get_setting "cooling.profile" "${PLATFORM}" "${ROMNAME##*/}")
+  if [ ! -z "${GAMEFAN}" ]
+  then
+    set_setting cooling.profile ${GAMEFAN}
+    systemctl restart fancontrol
+  fi
+fi
+
 # Disable netplay by default
 set_setting "netplay.client.ip" "disable"
 set_setting "netplay.client.port" "disable"
diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk
index 109cd1de6..5038e2db1 100644
--- a/packages/ui/emulationstation/package.mk
+++ b/packages/ui/emulationstation/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="emulationstation"
-PKG_VERSION="dbfbac5"
+PKG_VERSION="212be13155201ff296f70a3026a142eb8b6a7ea7"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_REV="1"
 PKG_ARCH="any"