diff --git a/src/iperf_tcp.c b/src/iperf_tcp.c
index 5b0e5d9..34b202a 100644
--- a/src/iperf_tcp.c
+++ b/src/iperf_tcp.c
@@ -273,7 +273,8 @@
 	 * connections as well.  See documentation in netannounce() for
 	 * more details.
 	 */
-#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
+// TODO(anmittal) : Remove funchsia check when we support IPV6_V6ONLY
+#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) && !defined(__Fuchsia__)
 	if (res->ai_family == AF_INET6 && (test->settings->domain == AF_UNSPEC || test->settings->domain == AF_INET)) {
 	    if (test->settings->domain == AF_UNSPEC)
 		opt = 0;
diff --git a/src/net.c b/src/net.c
index 51e8078..196e74a 100644
--- a/src/net.c
+++ b/src/net.c
@@ -175,7 +175,8 @@
      * OpenBSD explicitly omits support for IPv4-mapped addresses,
      * even though it implements IPV6_V6ONLY.
      */
-#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
+// TODO(anmittal) : Remove funchsia check when we support IPV6_V6ONLY
+#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) && !defined(__Fuchsia__)
     if (res->ai_family == AF_INET6 && (domain == AF_UNSPEC || domain == AF_INET6)) {
 	if (domain == AF_UNSPEC)
 	    opt = 0;