diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index b8fe9d756..a2a46a96e 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -50949,11 +50949,16 @@ SLPM-86003:
     multitap: false
     linkCable: false
 SLPS-01008:
-  name: "Einhaender"
+  name: "Einhänder"
   localizedName: "アインハンダー"
   saveName: "Einhaender (Japan)"
   controllers:
+    - AnalogController
     - DigitalController
+  traits:
+    - DisableAutoAnalogMode # Analog sticks do nothing.
+  settings:
+    cdromMaxReadSpeedupCycles: 70000
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -50969,19 +50974,26 @@ SLPS-01008:
     multitap: false
     linkCable: false
 SLPM-80164:
-  name: "Einhaender (Demo)"
+  name: "Einhänder (Demo)"
   localizedName: "アインハンダー"
   saveName: "Einhaender (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
+  settings:
+    cdromMaxReadSpeedupCycles: 70000
 SCUS-94243:
-  name: "Einhaender"
+  name: "Einhänder"
   saveName: "Einhaender (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2862-g6fbffb6f"
   controllers:
+    - AnalogController
     - DigitalController
+  traits:
+    - DisableAutoAnalogMode # Analog sticks do nothing.
+  settings:
+    cdromMaxReadSpeedupCycles: 70000
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"