diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index 65f9731..e036252 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1079,9 +1079,9 @@
     clientCompositionDisplay.targetLuminanceNits = outputState.clientTargetWhitePointNits;
 
     // Compute the global color transform matrix.
-    if (!outputState.usesDeviceComposition && !getSkipColorTransform()) {
-        clientCompositionDisplay.colorTransform = outputState.colorTransformMatrix;
-    }
+    clientCompositionDisplay.colorTransform = outputState.colorTransformMatrix;
+    clientCompositionDisplay.deviceHandlesColorTransform =
+            outputState.usesDeviceComposition || getSkipColorTransform();
 
     // Generate the client composition requests for the layers on this output.
     std::vector<LayerFE*> clientCompositionLayersFE;
diff --git a/services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp b/services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp
index e72bc9f..cab4b8d 100644
--- a/services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp
+++ b/services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp
@@ -3487,7 +3487,8 @@
                                             .maxLuminance = kDefaultMaxLuminance,
                                             .currentLuminanceNits = kDefaultMaxLuminance,
                                             .outputDataspace = kDefaultOutputDataspace,
-                                            .colorTransform = mat4(),
+                                            .colorTransform = kDefaultColorTransformMat,
+                                            .deviceHandlesColorTransform = true,
                                             .orientation = kDefaultOutputOrientationFlags,
                                             .targetLuminanceNits = kClientTargetLuminanceNits})
             .execute()
@@ -3505,7 +3506,8 @@
                                             .maxLuminance = kDefaultMaxLuminance,
                                             .currentLuminanceNits = kDisplayLuminance,
                                             .outputDataspace = kDefaultOutputDataspace,
-                                            .colorTransform = mat4(),
+                                            .colorTransform = kDefaultColorTransformMat,
+                                            .deviceHandlesColorTransform = true,
                                             .orientation = kDefaultOutputOrientationFlags,
                                             .targetLuminanceNits = kClientTargetLuminanceNits})
             .execute()
@@ -3522,7 +3524,8 @@
                                             .maxLuminance = kDefaultMaxLuminance,
                                             .currentLuminanceNits = kDefaultMaxLuminance,
                                             .outputDataspace = kDefaultOutputDataspace,
-                                            .colorTransform = mat4(),
+                                            .colorTransform = kDefaultColorTransformMat,
+                                            .deviceHandlesColorTransform = true,
                                             .orientation = kDefaultOutputOrientationFlags,
                                             .targetLuminanceNits = kClientTargetLuminanceNits})
             .execute()
@@ -3540,6 +3543,7 @@
                                             .currentLuminanceNits = kDefaultMaxLuminance,
                                             .outputDataspace = kDefaultOutputDataspace,
                                             .colorTransform = kDefaultColorTransformMat,
+                                            .deviceHandlesColorTransform = false,
                                             .orientation = kDefaultOutputOrientationFlags,
                                             .targetLuminanceNits = kClientTargetLuminanceNits})
             .execute()
@@ -3557,6 +3561,7 @@
                                             .currentLuminanceNits = kDefaultMaxLuminance,
                                             .outputDataspace = kDefaultOutputDataspace,
                                             .colorTransform = kDefaultColorTransformMat,
+                                            .deviceHandlesColorTransform = false,
                                             .orientation = kDefaultOutputOrientationFlags,
                                             .targetLuminanceNits = kClientTargetLuminanceNits})
             .execute()
@@ -3574,7 +3579,8 @@
                                             .maxLuminance = kDefaultMaxLuminance,
                                             .currentLuminanceNits = kDefaultMaxLuminance,
                                             .outputDataspace = kDefaultOutputDataspace,
-                                            .colorTransform = mat4(),
+                                            .colorTransform = kDefaultColorTransformMat,
+                                            .deviceHandlesColorTransform = true,
                                             .orientation = kDefaultOutputOrientationFlags,
                                             .targetLuminanceNits = kClientTargetLuminanceNits})
             .execute()