diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
index 6cee77a1afa..7a6701d5bdd 100644
--- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@@ -1 +1 @@
-5061f92a95ba45cfa49d78175fa8fb6e4d66a58d86634ea3fd3ae6d80cb0558a  /usr/local/bin/tox-bootstrapd
+ccaf7a29c16d97068952d872b8663e38cc3d958aff01baeafee04e0ac6f3ac98  /usr/local/bin/tox-bootstrapd
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 4c6665d321a..15fe74c797e 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -1058,6 +1058,11 @@ bool tox_bootstrap(Tox *tox, const char *host, uint16_t port, const uint8_t publ
     bool udp_success = tox->m->options.udp_disabled;
 
     for (int32_t i = 0; i < count; ++i) {
+        if (!tox->m->options.ipv6enabled && net_family_is_ipv6(root[i].ip.family)) {
+            // We can't use ipv6 when it's disabled.
+            continue;
+        }
+
         root[i].port = net_htons(port);
 
         if (onion_add_bs_path_node(tox->m->onion_c, &root[i], public_key)) {