diff --git a/sass/components/forms/_input-fields.scss b/sass/components/forms/_input-fields.scss
index ec55d97b86..45689d4edc 100644
--- a/sass/components/forms/_input-fields.scss
+++ b/sass/components/forms/_input-fields.scss
@@ -95,6 +95,17 @@ textarea.materialize-textarea {
   & + label:after {
     @extend %input-after-style;
   }
+
+  // TODO: Remove once input fields are reworked to support validation messages better
+  &.invalid + label:after,
+  &.valid + label:after{
+    display: none;
+  }
+
+  &.invalid + label.active:after,
+  &.valid + label.active:after{
+    display: block;
+  }
 }