diff --git a/player.c b/player.c
index c95588e9..a61dc841 100644
--- a/player.c
+++ b/player.c
@@ -1705,8 +1705,10 @@ void player_thread_cleanup_handler(void *arg) {
   if (conn->stream.type == ast_apple_lossless)
     terminate_decoders(conn);
 
-  if (conn->airplay_gid)
+  if (conn->airplay_gid) {
     free(conn->airplay_gid);
+    conn->airplay_gid = NULL;
+  }
 
   reset_anchor_info(conn);
   release_play_lock(conn);