diff --git a/src/atoms/ValidatedField.js b/src/atoms/ValidatedField.js
index 534d8cdece9a4d95fd6c8efe62e0fd6ac1787b05..c878ac5c94bdd93bbf785b5f48b341416f313619 100644
--- a/src/atoms/ValidatedField.js
+++ b/src/atoms/ValidatedField.js
@@ -10,7 +10,7 @@ const ValidatedFieldComponent = ({ component }) => ({ meta, input }) => (
   <div>
     {component(input)}
 
-    {meta.touched && (
+    {meta.touched && (meta.error || meta.warning) && (
       <div className={classes.messages}>
         {meta.error && (
           <div className={classnames(classes.message, classes.error)}>