diff --git a/src/backends/meta-color-device.c b/src/backends/meta-color-device.c
index 0df0ab86c..b2b830a23 100644
--- a/src/backends/meta-color-device.c
+++ b/src/backends/meta-color-device.c
@@ -1234,6 +1234,9 @@ meta_color_device_update (MetaColorDevice *color_device)
   size_t lut_size;
   unsigned int temperature;
 
+  if (!meta_color_device_is_ready (color_device))
+    return;
+
   color_profile = meta_color_device_get_assigned_profile (color_device);
   if (!color_profile)
     return;
diff --git a/src/backends/meta-color-manager.c b/src/backends/meta-color-manager.c
index df74f7a3f..a3a7361d8 100644
--- a/src/backends/meta-color-manager.c
+++ b/src/backends/meta-color-manager.c
@@ -252,9 +252,6 @@ update_device_properties (MetaColorManager *color_manager)
       if (!color_device)
         continue;
 
-      if (!meta_color_device_is_ready (color_device))
-          continue;
-
       meta_color_device_update (color_device);
     }
 }