diff --git a/lib/services/rocket.py b/lib/services/rocket.py
index cf6aef2..85db0e8 100644
--- a/lib/services/rocket.py
+++ b/lib/services/rocket.py
@@ -45,6 +45,10 @@ def from_rocket_model(cls, rocket: RocketView) -> Self:
             center_of_mass_without_motor=rocket.center_of_mass_without_motor,
             coordinate_system_orientation=rocket.coordinate_system_orientation.value.lower(),
         )
+        rocketpy_rocket.add_motor(
+            MotorService.from_motor_model(rocket.motor).motor,
+            rocket.motor_position,
+        )
 
         # RailButtons
         if rocket.rail_buttons:
@@ -53,10 +57,6 @@ def from_rocket_model(cls, rocket: RocketView) -> Self:
                 lower_button_position=rocket.rail_buttons.lower_button_position,
                 angular_position=rocket.rail_buttons.angular_position,
             )
-            rocketpy_rocket.add_motor(
-                MotorService.from_motor_model(rocket.motor).motor,
-                rocket.motor_position,
-            )
 
         # NoseCone
         if rocket.nose: