diff --git a/addon/components/o-s-s/text-area.hbs b/addon/components/o-s-s/text-area.hbs
index b1df4cb62..bbe26c361 100644
--- a/addon/components/o-s-s/text-area.hbs
+++ b/addon/components/o-s-s/text-area.hbs
@@ -1,5 +1,5 @@
 <div class="fx-1">
-  <div class="oss-textarea-container {{if this.hasError ' oss-textarea-container--errored'}}" ...attributes>
+  <div class="oss-textarea-container {{if @errorMessage ' oss-textarea-container--errored'}}" ...attributes>
     <Textarea
       @value={{@value}}
       placeholder={{@placeholder}}
diff --git a/addon/components/o-s-s/text-area.stories.js b/addon/components/o-s-s/text-area.stories.js
index 2cf3e36c5..8f7352bdc 100644
--- a/addon/components/o-s-s/text-area.stories.js
+++ b/addon/components/o-s-s/text-area.stories.js
@@ -68,16 +68,6 @@ export default {
       },
       control: { type: 'text' }
     },
-    hasError: {
-      description: 'Indicates if the textarea has an error state (adds danger-500 border)',
-      table: {
-        type: {
-          summary: 'boolean'
-        },
-        defaultValue: { summary: 'false' }
-      },
-      control: { type: 'boolean' }
-    },
     onChange: {
       description: 'Method called every time the textarea is updated',
       table: {
@@ -104,14 +94,13 @@ const defaultArgs = {
   disabled: false,
   placeholder: 'this is the placeholder',
   errorMessage: undefined,
-  hasError: false,
   onChange: action('onChange')
 };
 
 const DefaultUsageTemplate = (args) => ({
   template: hbs`
       <OSS::TextArea @value={{this.value}} @disabled={{this.disabled}} @placeholder={{this.placeholder}}
-                     @errorMessage={{this.errorMessage}} @hasError={{this.hasError}} @onChange={{this.onChange}} @rows={{this.rows}}
+                     @errorMessage={{this.errorMessage}} @onChange={{this.onChange}} @rows={{this.rows}}
                      @resize={{this.resize}} />
   `,
   context: args
@@ -119,15 +108,3 @@ const DefaultUsageTemplate = (args) => ({
 
 export const BasicUsage = DefaultUsageTemplate.bind({});
 BasicUsage.args = defaultArgs;
-
-export const WithError = DefaultUsageTemplate.bind({});
-WithError.args = {
-  ...defaultArgs,
-  hasError: true
-};
-
-export const WithErrorMessage = DefaultUsageTemplate.bind({});
-WithErrorMessage.args = {
-  ...defaultArgs,
-  errorMessage: 'This field is required'
-};
diff --git a/addon/components/o-s-s/text-area.ts b/addon/components/o-s-s/text-area.ts
index fe369e90c..d0efda609 100644
--- a/addon/components/o-s-s/text-area.ts
+++ b/addon/components/o-s-s/text-area.ts
@@ -10,7 +10,6 @@ export interface OSSTextAreaArgs {
   value?: string;
   disabled?: boolean;
   errorMessage?: string;
-  hasError?: boolean;
   placeholder?: string;
   onChange?(value: string): void;
 }
@@ -35,16 +34,11 @@ export default class OSSTextArea<T extends OSSTextAreaArgs> extends Component<T>
     return this.args.resize;
   }
 
-  get hasError(): boolean {
-    return this.args.hasError || !!this.args.errorMessage;
-  }
-
   get computedClass(): string {
     const classes: string[] = [];
     if (this.resize === 'vertical') classes.push('oss-textarea--resize-v');
     else if (this.resize === 'horizontal') classes.push('oss-textarea--resize-h');
     else if (this.resize === 'none') classes.push('oss-textarea--resize-none');
-    if (this.hasError) classes.push('oss-textarea--errored');
 
     return classes.join(' ');
   }
diff --git a/tests/integration/components/o-s-s/text-area-test.ts b/tests/integration/components/o-s-s/text-area-test.ts
index 6c75bf464..03c976a70 100644
--- a/tests/integration/components/o-s-s/text-area-test.ts
+++ b/tests/integration/components/o-s-s/text-area-test.ts
@@ -107,45 +107,5 @@ module('Integration | Component | o-s-s/text-area', function (hooks) {
       this.resize = 'NotACorrectValue';
       await render(hbs`<OSS::TextArea @resize={{this.resize}} />`);
     });
-
-    test('when @hasError is true, textarea has errored class', async function (assert) {
-      await render(hbs`<OSS::TextArea @hasError={{true}} />`);
-      assert.dom(this.textareaSelector).hasClass('oss-textarea--errored');
-      assert.dom('.oss-textarea-container').hasClass('oss-textarea-container--errored');
-    });
-
-    test('when @hasError is false, textarea does not have errored class', async function (assert) {
-      await render(hbs`<OSS::TextArea @hasError={{false}} />`);
-      assert.dom(this.textareaSelector).hasNoClass('oss-textarea--errored');
-      assert.dom('.oss-textarea-container').hasNoClass('oss-textarea-container--errored');
-    });
-
-    test('when @errorMessage is provided, textarea has errored class', async function (assert) {
-      await render(hbs`<OSS::TextArea @errorMessage="This is an error" />`);
-      assert.dom(this.textareaSelector).hasClass('oss-textarea--errored');
-      assert.dom('.oss-textarea-container').hasClass('oss-textarea-container--errored');
-      assert.dom('.font-color-error-500').exists();
-      assert.dom('.font-color-error-500').hasText('This is an error');
-    });
-
-    test('when @errorMessage is empty string, textarea does not have errored class', async function (assert) {
-      await render(hbs`<OSS::TextArea @errorMessage="" />`);
-      assert.dom(this.textareaSelector).hasNoClass('oss-textarea--errored');
-      assert.dom('.oss-textarea-container').hasNoClass('oss-textarea-container--errored');
-    });
-
-    test('when both @hasError and @errorMessage are provided, textarea has errored class', async function (assert) {
-      await render(hbs`<OSS::TextArea @hasError={{true}} @errorMessage="Error message" />`);
-      assert.dom(this.textareaSelector).hasClass('oss-textarea--errored');
-      assert.dom('.oss-textarea-container').hasClass('oss-textarea-container--errored');
-      assert.dom('.font-color-error-500').exists();
-      assert.dom('.font-color-error-500').hasText('Error message');
-    });
-
-    test('when neither @hasError nor @errorMessage are provided, textarea does not have errored class', async function (assert) {
-      await render(hbs`<OSS::TextArea />`);
-      assert.dom(this.textareaSelector).hasNoClass('oss-textarea--errored');
-      assert.dom('.oss-textarea-container').hasNoClass('oss-textarea-container--errored');
-    });
   });
 });