diff --git a/BUILD.gn b/BUILD.gn
index 8334573a41..af0de9f528 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -675,3 +675,6 @@ group("poison_audio_codecs") {
 
 group("poison_software_video_codecs") {
 }
+
+group("poison_default_task_queue") {
+}
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 01d79ea9a8..645daeead7 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -38,6 +38,7 @@ rtc_source_set("callfactory_api") {
 if (!build_with_chromium) {
   rtc_static_library("create_peerconnection_factory") {
     visibility = [ "*" ]
+    allow_poison = [ "default_task_queue" ]
     sources = [
       "create_peerconnection_factory.cc",
       "create_peerconnection_factory.h",
diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn
index 19b9e0ed2d..4b846071d6 100644
--- a/api/task_queue/BUILD.gn
+++ b/api/task_queue/BUILD.gn
@@ -49,6 +49,9 @@ rtc_source_set("task_queue_test") {
 
 rtc_source_set("default_task_queue_factory") {
   visibility = [ "*" ]
+  if (!is_ios && !is_android) {
+    poisonous = [ "default_task_queue" ]
+  }
   sources = [
     "default_task_queue_factory.h",
   ]
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 6361fb839b..bf585acaa3 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -343,6 +343,7 @@ rtc_source_set("rtc_media_engine_defaults") {
   visibility = [ "*" ]
   allow_poison = [
     "audio_codecs",
+    "default_task_queue",
     "software_video_codecs",
   ]
   sources = [
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 2eab502806..8303d8af46 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -459,7 +459,10 @@ if (is_ios || is_mac) {
     if (rtc_use_metal_rendering) {
       rtc_static_library("metal_objc") {
         visibility = [ "*" ]
-        allow_poison = [ "audio_codecs" ]  # TODO(bugs.webrtc.org/8396): Remove.
+        allow_poison = [
+          "audio_codecs",  # TODO(bugs.webrtc.org/8396): Remove.
+          "default_task_queue",
+        ]
         sources = [
           "objc/components/renderer/metal/RTCMTLI420Renderer.h",
           "objc/components/renderer/metal/RTCMTLI420Renderer.mm",
@@ -658,7 +661,10 @@ if (is_ios || is_mac) {
     # The applications which only use WebRTC DataChannel can depend on this.
     rtc_static_library("peerconnectionfactory_no_media_objc") {
       visibility = [ "*" ]
-      allow_poison = [ "audio_codecs" ]  # TODO(bugs.webrtc.org/8396): Remove.
+      allow_poison = [
+        "audio_codecs",  # TODO(bugs.webrtc.org/8396): Remove.
+        "default_task_queue",
+      ]
       defines = [ "HAVE_NO_MEDIA" ]
 
       sources = [
@@ -776,7 +782,10 @@ if (is_ios || is_mac) {
 
     rtc_static_library("peerconnectionfactory_base_objc") {
       visibility = [ "*" ]
-      allow_poison = [ "audio_codecs" ]  # TODO(bugs.webrtc.org/8396): Remove.
+      allow_poison = [
+        "audio_codecs",  # TODO(bugs.webrtc.org/8396): Remove.
+        "default_task_queue",
+      ]
       configs += [
         "..:no_exit_time_destructors",
         "..:no_global_constructors",
@@ -908,7 +917,6 @@ if (is_ios || is_mac) {
         ":videorendereradapter_objc",
         ":videosource_objc",
         ":videotoolbox_objc",
-        "../api:create_peerconnection_factory",
         "../api:libjingle_peerconnection_api",
         "../api:rtc_event_log_output_file",
         "../api:rtc_stats_api",
diff --git a/webrtc.gni b/webrtc.gni
index 9e13283ec0..e27a84aaac 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -368,6 +368,9 @@ all_poison_types = [
 
   # Software video codecs (VP8 and VP9 through libvpx).
   "software_video_codecs",
+
+  # Default task queue implementation.
+  "default_task_queue",
 ]
 
 absl_include_config = "//third_party/abseil-cpp:absl_include_config"