diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index e4c2c040772..0ead0a7903a 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -668,7 +668,6 @@ debian-clang:
       -D llvm=enabled
       -D microsoft-clc=disabled
       -D shared-llvm=enabled
-      -D shared-glapi=enabled
     GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
     VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau
     EXTRA_OPTION:
@@ -706,7 +705,6 @@ debian-clang-release:
       -D llvm=enabled
       -D microsoft-clc=disabled
       -D shared-llvm=enabled
-      -D shared-glapi=disabled
 
 windows-msvc:
   extends:
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 8711e3f005c..7ba1430b09a 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -51,7 +51,6 @@ meson setup `
 -Dgallium-drivers="swrast,d3d12,zink" `
 -Dgallium-va=enabled `
 -Dvideo-codecs="all" `
--Dshared-glapi=enabled `
 -Dgles1=enabled `
 -Dgles2=enabled `
 -Dgallium-opencl=icd `
diff --git a/meson.build b/meson.build
index 27b41a384f8..c6dad4c78ba 100644
--- a/meson.build
+++ b/meson.build
@@ -119,10 +119,8 @@ if gbm_backends_path == ''
   gbm_backends_path = join_paths(get_option('prefix'), get_option('libdir'), 'gbm')
 endif
 
-# Default shared glapi disabled for windows, enabled elsewhere.
-with_shared_glapi = get_option('shared-glapi') \
-  .disable_auto_if(host_machine.system() == 'windows') \
-  .allowed()
+# TODO: Remove this and the old static glapi along with it.
+with_shared_glapi = true
 
 with_opengl = get_option('opengl')
 
diff --git a/meson.options b/meson.options
index 5e0bbe631bd..2622cf1d235 100644
--- a/meson.options
+++ b/meson.options
@@ -297,9 +297,8 @@ option(
 option(
   'shared-glapi',
   type : 'feature',
-  deprecated: {'true': 'enabled', 'false': 'disabled'},
-  description : 'Whether to build a shared or static glapi. Defaults to ' +
-                'disabled on Windows, enabled elsewhere'
+  deprecated: true,
+  description : 'Does nothing, left here for a while to avoid build breakages.',
 )
 
 option(
diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build
index 8fd8a183b81..3034b463677 100644
--- a/src/mesa/state_tracker/tests/meson.build
+++ b/src/mesa/state_tracker/tests/meson.build
@@ -8,7 +8,7 @@ if not with_platform_windows
       'st_format_test',
       ['st_format.c'],
       include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-      link_with : [libmesa, shared_glapi_lib, libgallium, libglapi],
+      link_with : [libmesa, libglapi, libgallium],
       dependencies : [idep_gtest, idep_mesautil],
     ),
     suite : ['st_mesa'],