diff --git a/libobs/obs-output.c b/libobs/obs-output.c
index e7846eba2..2141590b2 100644
--- a/libobs/obs-output.c
+++ b/libobs/obs-output.c
@@ -170,16 +170,18 @@ void obs_output_destroy(obs_output_t *output)
 
 		if (output->valid && active(output))
 			obs_output_actual_stop(output, true, 0);
-		if (output->service)
-			output->service->output = NULL;
 
+		os_event_wait(output->stopping_event);
 		if (data_capture_ending(output))
 			pthread_join(output->end_data_capture_thread, NULL);
-		free_packets(output);
 
+		if (output->service)
+			output->service->output = NULL;
 		if (output->context.data)
 			output->info.destroy(output->context.data);
 
+		free_packets(output);
+
 		if (output->video_encoder) {
 			obs_encoder_remove_output(output->video_encoder,
 					output);