diff --git a/libgralloc/gpu.cpp b/libgralloc/gpu.cpp
index 0eee65e..2284633 100644
--- a/libgralloc/gpu.cpp
+++ b/libgralloc/gpu.cpp
@@ -136,11 +136,6 @@
             flags |= private_handle_t::PRIV_FLAGS_CPU_RENDERED;
         }
 
-        ColorSpace_t colorSpace = ITU_R_601;
-        if (usage & GRALLOC_USAGE_HW_CAMERA_MASK) {
-            colorSpace = ITU_R_601_FR;
-        }
-
         if (usage & (GRALLOC_USAGE_HW_VIDEO_ENCODER |
                 GRALLOC_USAGE_HW_CAMERA_WRITE |
                 GRALLOC_USAGE_HW_RENDER |
@@ -165,6 +160,7 @@
         hnd->offset = data.offset;
         hnd->base = (uint64_t)(data.base) + data.offset;
         hnd->gpuaddr = 0;
+        ColorSpace_t colorSpace = ITU_R_601_FR;
         setMetaData(hnd, UPDATE_COLOR_SPACE, (void*) &colorSpace);
 
         *pHandle = hnd;