1 files changed, 3 insertions, 0 deletions
diff --git a/thread.c b/thread.c
index 0aff67750b..3bd89b9bde 100644
--- a/thread.c
+++ b/thread.c
@@ -462,6 +462,9 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
 	}
     }
     thread_cleanup_func(th);
+    if (th->vm->main_thread == th) {
+	rb_thread_stop_timer_thread();
+    }
     native_mutex_unlock(&th->vm->global_vm_lock);
 
     return 0;