diff --git a/spd/lp5/set-1/spd-7.hex b/spd/lp5/set-1/spd-7.hex
index 8b18d495d6..a38dbbd4e9 100644
--- a/spd/lp5/set-1/spd-7.hex
+++ b/spd/lp5/set-1/spd-7.hex
@@ -1,4 +1,4 @@
-23 11 15 0E 86 21 95 18 00 40 00 00 02 02 00 00
+23 11 13 0E 86 21 95 18 00 40 00 00 02 02 00 00
 00 00 03 00 00 00 00 00 2B 00 90 A8 90 C0 08 60
 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/spd/lp5/set-1/spd-8.hex b/spd/lp5/set-1/spd-8.hex
index 0602fefe62..e08c69559d 100644
--- a/spd/lp5/set-1/spd-8.hex
+++ b/spd/lp5/set-1/spd-8.hex
@@ -1,4 +1,4 @@
-23 11 15 0E 86 21 B5 18 00 40 00 00 0A 02 00 00
+23 11 13 0E 86 21 B5 18 00 40 00 00 0A 02 00 00
 00 00 03 00 00 00 00 00 2B 00 90 A8 90 C0 08 60
 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
diff --git a/util/spd_tools/src/spd_gen/lp5.go b/util/spd_tools/src/spd_gen/lp5.go
index bf7b8331e1..5d73cd5450 100644
--- a/util/spd_tools/src/spd_gen/lp5.go
+++ b/util/spd_tools/src/spd_gen/lp5.go
@@ -466,7 +466,9 @@ func LP5GetBankGroups(memAttribs *LP5MemAttributes) int {
 func LP5EncodeMemoryType(memAttribs *LP5MemAttributes) byte {
 	var b byte
 
-	if memAttribs.LP5X {
+	// Mendocino supports LP5x, but doesn't support 0x15 as a memory type currently.
+	// Temporary workaround until it's supported with ABL changes
+	if memAttribs.LP5X && LP5CurrSet != 1 {
 		b = LP5XSPDValueMemoryType
 	} else {
 		b = LP5SPDValueMemoryType