diff --git a/plugins/linux-jack/jack-wrapper.c b/plugins/linux-jack/jack-wrapper.c
index 16a341974..d9bba60cd 100644
--- a/plugins/linux-jack/jack-wrapper.c
+++ b/plugins/linux-jack/jack-wrapper.c
@@ -64,8 +64,6 @@ int jack_process_callback(jack_nframes_t nframes, void *arg)
 	if (data == 0)
 		return 0;
 
-	pthread_mutex_lock(&data->jack_mutex);
-
 	struct obs_source_audio out;
 	out.speakers = jack_channels_to_obs_speakers(data->channels);
 	out.samples_per_sec = jack_get_sample_rate(data->jack_client);
@@ -83,8 +81,9 @@ int jack_process_callback(jack_nframes_t nframes, void *arg)
 	out.timestamp = os_gettime_ns() -
 			jack_frames_to_time(data->jack_client, nframes);
 
+	/* FIXME: this function is not realtime-safe, we should do something
+	 * about this */
 	obs_source_output_audio(data->source, &out);
-	pthread_mutex_unlock(&data->jack_mutex);
 	return 0;
 }
 
@@ -151,17 +150,11 @@ void deactivate_jack(struct jack_data *data)
 	pthread_mutex_lock(&data->jack_mutex);
 
 	if (data->jack_client) {
+		jack_client_close(data->jack_client);
 		if (data->jack_ports != NULL) {
-			for (int i = 0; i < data->channels; ++i) {
-				if (data->jack_ports[i] != NULL)
-					jack_port_unregister(
-						data->jack_client,
-						data->jack_ports[i]);
-			}
 			bfree(data->jack_ports);
 			data->jack_ports = NULL;
 		}
-		jack_client_close(data->jack_client);
 		data->jack_client = NULL;
 	}
 	pthread_mutex_unlock(&data->jack_mutex);