diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java
index e64377e6..de4865c0 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java
@@ -51,7 +51,10 @@ public class PictureAdjustmentController extends LiveDisplayFeature {
 
         boolean usePA = mHardware.isSupported(LineageHardwareManager.FEATURE_PICTURE_ADJUSTMENT);
         if (usePA) {
-            mRanges.addAll(mHardware.getPictureAdjustmentRanges());
+            final List<Range<Float>> r = mHardware.getPictureAdjustmentRanges();
+            if (r != null) {
+                mRanges.addAll(r);
+            }
             if (mRanges.size() < 4) {
                 usePA = false;
             } else {