diff --git a/src/player.c b/src/player.c
index bd8ec012..9b5bc5a2 100644
--- a/src/player.c
+++ b/src/player.c
@@ -3720,6 +3720,7 @@ int
 player_init(void)
 {
   uint32_t rnd;
+  int raop_v6enabled;
   int ret;
 
   player_exit = 0;
@@ -3832,7 +3833,7 @@ player_init(void)
       goto laudio_fail;
     }
 
-  ret = raop_init();
+  ret = raop_init(&raop_v6enabled);
   if (ret < 0)
     {
       DPRINTF(E_LOG, L_PLAYER, "RAOP init failed\n");
diff --git a/src/raop.c b/src/raop.c
index ccce0b45..b57f681a 100644
--- a/src/raop.c
+++ b/src/raop.c
@@ -3416,7 +3416,7 @@ raop_set_status_cb(struct raop_session *rs, raop_status_cb cb)
 
 
 int
-raop_init(void)
+raop_init(int *v6enabled)
 {
   char ebuf[64];
   char *ptr;
@@ -3515,6 +3515,8 @@ raop_init(void)
       goto out_stop_timing;
     }
 
+  *v6enabled = !((timing_6svc.fd < 0) || (control_6svc.fd < 0));
+
   return 0;
 
  out_stop_timing:
diff --git a/src/raop.h b/src/raop.h
index 516e3aaa..d530bdf3 100644
--- a/src/raop.h
+++ b/src/raop.h
@@ -118,7 +118,7 @@ raop_v2_write(uint8_t *buf, uint64_t rtptime);
 
 
 int
-raop_init(void);
+raop_init(int *v6enabled);
 
 void
 raop_deinit(void);