diff --git a/projects/recalbox-hardware/case/installers/gpi/install.py b/projects/recalbox-hardware/case/installers/gpi/install.py
index 29c2b0dbb7bf98f44c7350dcded46b0b64bcced1..378202cb515155e9693e7b9a45a9b79278bf17d3 100755
--- a/projects/recalbox-hardware/case/installers/gpi/install.py
+++ b/projects/recalbox-hardware/case/installers/gpi/install.py
@@ -71,7 +71,7 @@ class Install(InstallBase):
             board: str = "unknown"
             with open("/recalbox/recalbox.arch", "r") as sf:
                 board = sf.readline()
-            if board not in ("rpi0", "rpi1", "rpizero2legacy"):
+            if board not in ("rpi0", "rpi1", "rpizero2"):
                 os.system("fbv2 -i -k /recalbox/system/resources/splash/gpierror.png")
                 while True: pass  # Infinite loop
 
diff --git a/projects/recalbox-hardware/case/manage.py b/projects/recalbox-hardware/case/manage.py
index b808824579d2389c9de2ca25533fd39e1de906a0..c845240708a63444e9c85b15ab37af226614ef57 100644
--- a/projects/recalbox-hardware/case/manage.py
+++ b/projects/recalbox-hardware/case/manage.py
@@ -165,10 +165,10 @@ def Identify(previousCase):
     with open("/recalbox/recalbox.arch", "r") as sf:
         board = sf.readline()
 
-    if board in ("rpi0", "rpi1", "rpi3", "rpizero2legacy"):
+    if board in ("rpi0", "rpi1", "rpi3", "rpizero2"):
         case = DetectGPiCase()
 
-    if board in ("rpizero2"):
+    if board in ("rpizero2") and case in (cases.NONE):
         case = DetectGPiCase2W()
 
     if board in ("rpi4", "rpi4_64"):