diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
index 9a00d5718c..9d01b41190 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
@@ -39,6 +39,12 @@ function valFormManager(serverValidationManager, $rootScope, $log, $timeout, not
         },
         link: function (scope, element, attr, formCtrl) {
 
+
+            /*
+            FIXME: This is commented out because it caused this error 
+            http://uixdk.com/angular/docs/error/ng/cpws
+            resulting in an endless digest loop for all editors
+
             scope.$watch(function () {
                 return formCtrl.$error;
             }, function (e) {
@@ -127,6 +133,7 @@ function valFormManager(serverValidationManager, $rootScope, $log, $timeout, not
             $timeout(function(){
                 formCtrl.$setPristine();
             }, 1000);
+            */
         }
     };
 }