diff --git a/daemon/media_player.c b/daemon/media_player.c
index b9bd5d284..5d6b7992d 100644
--- a/daemon/media_player.c
+++ b/daemon/media_player.c
@@ -812,8 +812,7 @@ static void media_player_cache_entry_decoder_thread(void *p) {
 			media_player_kernel_player_start_now(mp);
 		obj_put(&mp->tt_obj);
 	}
-	t_hash_table_destroy(entry->wait_queue); // not needed any more
-	entry->wait_queue = media_player_ht_null();
+	t_hash_table_destroy_ptr(&entry->wait_queue); // not needed any more
 	obj_release(entry->call_ref);
 
 	mutex_unlock(&entry->lock);
diff --git a/daemon/media_socket.c b/daemon/media_socket.c
index 470b42ffb..1863b004a 100644
--- a/daemon/media_socket.c
+++ b/daemon/media_socket.c
@@ -3360,8 +3360,7 @@ void interfaces_free(void) {
 		}
 	}
 
-	t_hash_table_destroy(local_media_socket_endpoints);
-	local_media_socket_endpoints = local_sockets_ht_null();
+	t_hash_table_destroy_ptr(&local_media_socket_endpoints);
 }