diff --git a/src/components/form/form-invalid-feedback.js b/src/components/form/form-invalid-feedback.js
index 291bacd517a..5b99952b429 100644
--- a/src/components/form/form-invalid-feedback.js
+++ b/src/components/form/form-invalid-feedback.js
@@ -19,7 +19,7 @@ export const props = {
     default: false
   },
   state: {
-    type: [Boolean, String],
+    type: Boolean,
     default: null
   },
   ariaLive: {
@@ -38,7 +38,7 @@ export const BFormInvalidFeedback = /*#__PURE__*/ Vue.extend({
   functional: true,
   props,
   render(h, { props, data, children }) {
-    const show = props.forceShow === true || props.state === false || props.state === 'invalid'
+    const show = props.forceShow === true || props.state === false
     return h(
       props.tag,
       mergeData(data, {
diff --git a/src/components/form/form-invalid-feedback.spec.js b/src/components/form/form-invalid-feedback.spec.js
index 84e850d7370..8e27a03a066 100644
--- a/src/components/form/form-invalid-feedback.spec.js
+++ b/src/components/form/form-invalid-feedback.spec.js
@@ -71,17 +71,6 @@ describe('form-invalid-feedback', () => {
     expect(feedback.classes()).toContain('d-block')
   })
 
-  it('should contain class d-block when state is "invalid"', async () => {
-    const feedback = mount(BFormInvalidFeedback, {
-      context: {
-        props: {
-          state: 'invalid'
-        }
-      }
-    })
-    expect(feedback.classes()).toContain('d-block')
-  })
-
   it('should not contain class d-block when state is true', async () => {
     const feedback = mount(BFormInvalidFeedback, {
       context: {
@@ -93,17 +82,6 @@ describe('form-invalid-feedback', () => {
     expect(feedback.classes()).not.toContain('d-block')
   })
 
-  it('should not contain class d-block when state is "valid"', async () => {
-    const feedback = mount(BFormInvalidFeedback, {
-      context: {
-        props: {
-          state: 'valid'
-        }
-      }
-    })
-    expect(feedback.classes()).not.toContain('d-block')
-  })
-
   it('should contain class d-block when force-show is true and state is true', async () => {
     const feedback = mount(BFormInvalidFeedback, {
       context: {
diff --git a/src/components/form/form-valid-feedback.js b/src/components/form/form-valid-feedback.js
index bea5fc99adc..66a0fad20f1 100644
--- a/src/components/form/form-valid-feedback.js
+++ b/src/components/form/form-valid-feedback.js
@@ -19,7 +19,7 @@ export const props = {
     default: false
   },
   state: {
-    type: [Boolean, String],
+    type: Boolean,
     default: null
   },
   ariaLive: {
@@ -38,7 +38,7 @@ export const BFormValidFeedback = /*#__PURE__*/ Vue.extend({
   functional: true,
   props,
   render(h, { props, data, children }) {
-    const show = props.forceShow === true || props.state === true || props.state === 'valid'
+    const show = props.forceShow === true || props.state === true
     return h(
       props.tag,
       mergeData(data, {
diff --git a/src/components/form/form-valid-feedback.spec.js b/src/components/form/form-valid-feedback.spec.js
index 6bc3b5932ba..8e19faf9a7c 100644
--- a/src/components/form/form-valid-feedback.spec.js
+++ b/src/components/form/form-valid-feedback.spec.js
@@ -71,17 +71,6 @@ describe('form-valid-feedback', () => {
     expect(feedback.classes()).toContain('d-block')
   })
 
-  it('should contain class d-block when state is "valid"', async () => {
-    const feedback = mount(BFormValidFeedback, {
-      context: {
-        props: {
-          state: 'valid'
-        }
-      }
-    })
-    expect(feedback.classes()).toContain('d-block')
-  })
-
   it('should not contain class d-block when state is false', async () => {
     const feedback = mount(BFormValidFeedback, {
       context: {
@@ -93,17 +82,6 @@ describe('form-valid-feedback', () => {
     expect(feedback.classes()).not.toContain('d-block')
   })
 
-  it('should not contain class d-block when state is "invalid"', async () => {
-    const feedback = mount(BFormValidFeedback, {
-      context: {
-        props: {
-          state: 'invalid'
-        }
-      }
-    })
-    expect(feedback.classes()).not.toContain('d-block')
-  })
-
   it('should contain class d-block when force-show is true and state is false', async () => {
     const feedback = mount(BFormValidFeedback, {
       context: {