diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index b97dba5e7706..299808002fac 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2671,18 +2671,6 @@ void gfxPlatform::InitWebRenderConfig() {
 
   bool hasHardware = gfxConfig::IsEnabled(Feature::WEBRENDER);
   bool hasSoftware = gfxConfig::IsEnabled(Feature::WEBRENDER_SOFTWARE);
-
-#if defined(XP_WIN) && !defined(EARLY_BETA_OR_EARLIER)
-  // If we have D3D11 compositing, and Software WebRender isn't forced on, then
-  // we should prefer D3D11 compositing over Software WebRender in late beta and
-  // release by default. We may chose to fallback to Software WebRender in
-  // gfxPlatform::FallbackFromAcceleration.
-  if (gfxConfig::IsEnabled(Feature::D3D11_COMPOSITING) &&
-      !gfxConfig::IsForcedOnByUser(Feature::WEBRENDER_SOFTWARE)) {
-    hasSoftware = false;
-  }
-#endif
-
   bool hasWebRender = hasHardware || hasSoftware;
 
 #ifdef XP_WIN
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index d8e903ed66da..1dfececb2adf 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -5012,7 +5012,7 @@
   # Whether or not to fallback from WebRender to Software WebRender + D3D11.
 -   name: gfx.webrender.fallback.software-d3d11
     type: bool
-    value: @IS_NIGHTLY_BUILD@
+    value: true
     mirror: once
 #endif