diff --git a/y2019/joystick_reader.cc b/y2019/joystick_reader.cc
index c4a1caf..e435b96 100644
--- a/y2019/joystick_reader.cc
+++ b/y2019/joystick_reader.cc
@@ -122,6 +122,9 @@
       : ::aos::input::ActionJoystickInput(
             event_loop,
             ::y2019::control_loops::drivetrain::GetDrivetrainConfig()) {
+    // Set teleop to immediately resume after auto ends for sandstorm mode.
+    set_run_teleop_in_auto(true);
+
     const uint16_t team = ::aos::network::GetTeamNumber();
     superstructure_queue.goal.FetchLatest();
     if (superstructure_queue.goal.get()) {