diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
index 9b38be4791..403f409299 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
@@ -76,7 +76,7 @@ function ColorPickerController($scope, angularHelper) {
 
     $scope.onSelect = function (color) {
         // did the value change?
-        if ($scope.model.value.value === color) {
+        if ($scope.model.value != null && $scope.model.value.value === color) {
             // User clicked the currently selected color
             // to remove the selection, they don't want
             // to select any color after all.