diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index d8fb169d9f8..7ac275724cd 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -10,6 +10,7 @@
 1. [GENERAL] Fixed issue in C++ WASM Framework that caused performance degradation in some WASM modules - @frankkopp (Frank Kopp)
 1. [A380X/FCU] Fixed auto-initialisation of baro unit - @tracernz (Mike)
 1. [A380X/FCU] Fix baro-preselect not recognising baro unit changes - @tracernz (Mike)
+1. [A380X/EFB] Fixed doors automatically opening in flight
 
 ## 0.12.0
 
diff --git a/fbw-common/src/systems/instruments/src/EFB/Ground/Pages/Services/A380_842/A380Services.tsx b/fbw-common/src/systems/instruments/src/EFB/Ground/Pages/Services/A380_842/A380Services.tsx
index a88a99563f5..c76ce604c2c 100644
--- a/fbw-common/src/systems/instruments/src/EFB/Ground/Pages/Services/A380_842/A380Services.tsx
+++ b/fbw-common/src/systems/instruments/src/EFB/Ground/Pages/Services/A380_842/A380Services.tsx
@@ -477,19 +477,19 @@ export const A380Services: React.FC = () => {
       dispatch(setGpuButtonState(ServiceButtonState.DISABLED));
       dispatch(setBaggageButtonState(ServiceButtonState.DISABLED));
       dispatch(setCateringButtonState(ServiceButtonState.DISABLED));
-      if (boarding1DoorButtonState === 1) {
+      if (main1LeftDoorOpen === 1) {
         toggleMain1LeftDoor();
       }
-      if (boarding2DoorButtonState === 1) {
+      if (main2LeftDoorOpen === 1) {
         toggleMain2LeftDoor();
       }
-      if (boarding3DoorButtonState === 1) {
+      if (upper1LeftDoorOpen === 1) {
         toggleUpper1LeftDoor();
       }
-      if (serviceDoorButtonState === 1) {
+      if (main4RightDoorOpen === 1) {
         toggleMain4RightDoor();
       }
-      if (cargo1DoorButtonState === 1) {
+      if (frontCargoDoorOpen === 1) {
         toggleFrontCargoDoor();
       }
     } else if (