diff --git a/src/main.js b/src/main.js
index bf4a3ee..cec25a1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -83,7 +83,7 @@ Formsy.Form = React.createClass({
 
   componentDidUpdate: function () {
 
-    if (this.props.validationErrors) {
+    if (this.props.validationErrors && typeof this.props.validationErrors === 'object' && Object.keys(this.props.validationErrors).length > 0) {
       this.setInputValidationErrors(this.props.validationErrors);
     }
 
diff --git a/tests/Element-spec.js b/tests/Element-spec.js
index 90be589..83acf34 100644
--- a/tests/Element-spec.js
+++ b/tests/Element-spec.js
@@ -295,6 +295,29 @@ export default {
 
   },
 
+  'should not override error messages with error messages passed by form if passed eror messages is an empty object': function (test) {
+
+    const TestForm = React.createClass({
+      render() {
+        return (
+          <Formsy.Form validationErrors={{}}>
+            <TestInput name="A" validations={{
+              isEmail: true
+            }} validationError="bar2" validationErrors={{isEmail: 'bar3'}} value="foo"/>
+          </Formsy.Form>
+        );
+      }
+    });
+    const form = TestUtils.renderIntoDocument(<TestForm/>);
+
+    const inputComponent = TestUtils.findRenderedComponentWithType(form, TestInput);
+    test.equal(inputComponent.getErrorMessage(), 'bar3');
+
+    test.done();
+
+  },
+
+
   'should override all error messages with error messages passed by form': function (test) {
 
     const TestForm = React.createClass({