diff --git a/irobot_create_common/irobot_create_control/launch/include/control.py b/irobot_create_common/irobot_create_control/launch/include/control.py
index 26aa2497..2fea124e 100644
--- a/irobot_create_common/irobot_create_control/launch/include/control.py
+++ b/irobot_create_common/irobot_create_control/launch/include/control.py
@@ -30,14 +30,26 @@ def generate_launch_description():
         executable='spawner',
         namespace=namespace,  # Namespace is not pushed when used in EventHandler
         parameters=[control_params_file],
-        arguments=['diffdrive_controller', '-c', 'controller_manager'],
+        arguments=[
+            'diffdrive_controller',
+            '-c',
+            'controller_manager',
+            '--controller-manager-timeout',
+            '30'
+        ],
         output='screen',
     )
 
     joint_state_broadcaster_spawner = Node(
         package='controller_manager',
         executable='spawner',
-        arguments=['joint_state_broadcaster', '-c', 'controller_manager'],
+        arguments=[
+            'joint_state_broadcaster',
+            '-c',
+            'controller_manager',
+            '--controller-manager-timeout',
+            '30'
+        ],
         output='screen',
     )