diff --git a/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service b/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service
index 79e9f3dd..549b7f58 100644
--- a/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service
+++ b/system_files/desktop/shared/usr/lib/systemd/system/bazzite-hardware-setup.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Configure Bazzite for current hardware
-After=rpm-ostreed.service
+After=rpm-ostreed.service tuned.service
 Before=systemd-user-sessions.service jupiter-biosupdate.service jupiter-controller-update.service
 
 [Service]
diff --git a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
index 46baa711..9551bb67 100755
--- a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
@@ -246,6 +246,15 @@ else
   echo "No minimum-free ZRAM changes needed"
 fi
 
+# NO-PSTATE FIX
+if grep -q "acpi-cpufreq" <<< "$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver)"; then
+  sed -i 's/balanced=balanced/balanced=balanced-no-pstate/g' /etc/tuned/ppd.conf
+  tuned-adm profile balanced-no-pstate
+else
+  sed -i 's/balanced=balanced-no-pstate/balanced=balanced/g' /etc/tuned/ppd.conf
+  tuned-adm profile balanced
+fi
+
 # HOSTNAME FIX
 # If the hostname is too long Distrobox will fail during setup
 # Let's check the length and reset it to something sensible if that happens.