diff --git a/common/TracySocket.cpp b/common/TracySocket.cpp
index ade450fe..6a0fc446 100644
--- a/common/TracySocket.cpp
+++ b/common/TracySocket.cpp
@@ -386,33 +386,37 @@ ListenSocket::~ListenSocket()
     if( m_sock != -1 ) Close();
 }
 
-bool ListenSocket::Listen( int port, int backlog )
+static int addrinfo_and_socket_for_family(int port, int ai_family, struct addrinfo** res)
 {
-    assert( m_sock == -1 );
-
-    struct addrinfo* res;
     struct addrinfo hints;
-
     memset( &hints, 0, sizeof( hints ) );
-    hints.ai_family = AF_INET6;
+    hints.ai_family = ai_family;
     hints.ai_socktype = SOCK_STREAM;
 #ifndef TRACY_ONLY_LOCALHOST
     hints.ai_flags = AI_PASSIVE;
 #endif
-
     char portbuf[32];
     sprintf( portbuf, "%i", port );
+    if( getaddrinfo( nullptr, portbuf, &hints, res ) != 0 ) return -1;
+    int sock = socket( (*res)->ai_family, (*res)->ai_socktype, (*res)->ai_protocol );
+    if (sock == -1) freeaddrinfo( *res );
+    return sock;
+}
 
-    if( getaddrinfo( nullptr, portbuf, &hints, &res ) != 0 ) return false;
+bool ListenSocket::Listen( int port, int backlog )
+{
+    assert( m_sock == -1 );
 
-    m_sock = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
+    struct addrinfo* res = nullptr;
+
+#ifndef TRACY_ONLY_IPV4
+    m_sock = addrinfo_and_socket_for_family(port, AF_INET6, &res);
+#endif
     if (m_sock == -1)
     {
         // IPV6 protocol may not be available/is disabled. Try to create a socket
         // with the IPV4 protocol
-        hints.ai_family = AF_INET;
-        if( getaddrinfo( nullptr, portbuf, &hints, &res ) != 0 ) return false;
-        m_sock = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
+        m_sock = addrinfo_and_socket_for_family(port, AF_INET, &res);
         if( m_sock == -1 ) return false;
     }
 #if defined _WIN32 || defined __CYGWIN__
diff --git a/manual/tracy.tex b/manual/tracy.tex
index 57098426..e36528e1 100644
--- a/manual/tracy.tex
+++ b/manual/tracy.tex
@@ -427,6 +427,8 @@ By default Tracy client will announce its presence to the local network\footnote
 
 By default Tracy client will listen on all network interfaces. If you want to restrict it to only listening on the localhost interface, define the \texttt{TRACY\_ONLY\_LOCALHOST} macro.
 
+By default Tracy client will listen on IPv6 interfaces, falling back to IPv4 only if IPv6 is not available. If you want to restrict it to only listening on IPv4 interfaces, define the \texttt{TRACY\_ONLY\_IPV4} macro.
+
 \subsubsection{Setup for multi-DLL projects}
 
 In projects that consist of multiple DLLs/shared objects things are a bit different. Compiling \texttt{TracyClient.cpp} into every DLL is not an option because this would result in several instances of Tracy objects lying around in the process. We rather need to pass the instances of them to the different DLLs to be reused there.