diff --git a/manifest.xml b/manifest.xml
index fd07002..afebc60 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -39,6 +39,17 @@
            name="android_external_mesa3d_panfrost"
            remote="bscubed" />
 
+  <!-- Framework: carries a fix for an AOSP Android 16 regression (commit
+       95bb63c87eca) where DisplayManagerService rejects the GLOBAL user-preferred
+       display mode (displayId == INVALID_DISPLAY has no DisplayDevice, so a null
+       guard early-returns), making the TvSettings Resolution/refresh-rate pickers
+       a silent no-op. Unfixed upstream as of android16-qpr2-release. -->
+  <remove-project name="LineageOS/android_frameworks_base" />
+  <project path="frameworks/base"
+           name="android_frameworks_base"
+           remote="bscubed"
+           groups="pdk-cw-fs,pdk-fs,sysui-studio" />
+
   <!-- Media / FFmpeg -->
   <remove-project name="platform/external/libudev-zero" />
   <project path="external/ffmpeg"