diff --git a/src/mainboard/google/guybrush/variants/nipperkin/variant.c b/src/mainboard/google/guybrush/variants/nipperkin/variant.c
index 204ec61b55..9ffb2d5389 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/variant.c
+++ b/src/mainboard/google/guybrush/variants/nipperkin/variant.c
@@ -4,6 +4,7 @@
 #include <boardid.h>
 #include <device/device.h>
 #include <soc/gpio.h>
+#include <string.h>
 
 void variant_update_dxio_descriptors(fsp_dxio_descriptor *dxio_descriptors)
 {
@@ -12,6 +13,9 @@ void variant_update_dxio_descriptors(fsp_dxio_descriptor *dxio_descriptors)
 	if (board_version >= 3) {
 		dxio_descriptors[WLAN].link_aspm_L1_1 = true;
 		dxio_descriptors[WLAN].link_aspm_L1_2 = true;
+		/* Disable PSPP to avoid S0ix hangs - b/228830362 */
+		memset(dxio_descriptors[WLAN].port_params, 0,
+		       sizeof(dxio_descriptors[WLAN].port_params));
 	} else {
 		dxio_descriptors[WLAN].link_aspm_L1_1 = false;
 		dxio_descriptors[WLAN].link_aspm_L1_2 = false;