diff --git a/gfx/config/gfxConfigManager.cpp b/gfx/config/gfxConfigManager.cpp
index bbf909507d24..94cb7e53839c 100644
--- a/gfx/config/gfxConfigManager.cpp
+++ b/gfx/config/gfxConfigManager.cpp
@@ -32,7 +32,11 @@ void gfxConfigManager::Init() {
   mWrForceEnabled = gfxPlatform::WebRenderPrefEnabled();
   mWrSoftwareForceEnabled = StaticPrefs::gfx_webrender_software_AtStartup();
   mWrCompositorForceEnabled =
+#ifdef MOZ_WAYLAND
+      StaticPrefs::gfx_wayland_hdr_AtStartup();
+#else
       StaticPrefs::gfx_webrender_compositor_force_enabled_AtStartup();
+#endif
   mGPUProcessAllowSoftware =
       StaticPrefs::layers_gpu_process_allow_software_AtStartup();
   mWrForcePartialPresent =
diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index 89b62b72b6e0..0257a81f4885 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -322,9 +322,6 @@ void gfxPlatformGtk::InitWebRenderConfig() {
   FeatureState& feature = gfxConfig::GetFeature(Feature::WEBRENDER_COMPOSITOR);
   // HDR requires compositor to work
 #if defined(MOZ_WAYLAND)
-  if (StaticPrefs::gfx_wayland_hdr_AtStartup()) {
-    feature.UserForceEnable("Requested for HDR");
-  }
   if (feature.IsEnabled()) {
     if (!StaticPrefs::gfx_wayland_hdr_AtStartup()) {
       feature.ForceDisable(FeatureStatus::Unavailable, "HDR mode is disabled",