diff --git a/src/Row.js b/src/Row.js
index c47c4b96a..66b7ebc07 100644
--- a/src/Row.js
+++ b/src/Row.js
@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { mapToCssModules, tagPropType } from './utils';
+import { mapToCssModules, tagPropType, deprecated } from './utils';
 
 const rowColWidths = ['xs', 'sm', 'md', 'lg', 'xl'];
 const rowColsPropType = PropTypes.oneOfType([PropTypes.number, PropTypes.string]);
 
 const propTypes = {
   tag: tagPropType,
-  noGutters: PropTypes.bool,
+  noGutters: deprecated(PropTypes.bool, "Please use Bootstrap 5 gutter utility classes. https://getbootstrap.com/docs/5.0/layout/gutters/"),
   className: PropTypes.string,
   cssModule: PropTypes.object,
   form: PropTypes.bool,
@@ -52,7 +52,7 @@ const Row = (props) => {
 
   const classes = mapToCssModules(classNames(
     className,
-    noGutters ? 'no-gutters' : null,
+    noGutters ? 'gx-0' : null,
     form ? 'form-row' : 'row',
     colClasses
   ), cssModule);
diff --git a/src/__tests__/Row.spec.js b/src/__tests__/Row.spec.js
index 098f01555..736b82760 100644
--- a/src/__tests__/Row.spec.js
+++ b/src/__tests__/Row.spec.js
@@ -22,10 +22,10 @@ describe('Row', () => {
     expect(wrapper.hasClass('row')).toBe(true);
   });
 
-  it('show render noGutters classes', () => {
+  it('show render noGutters class as gx-0', () => {
     const wrapper = shallow(<Row noGutters />);
 
-    expect(wrapper.hasClass('no-gutters')).toBe(true);
+    expect(wrapper.hasClass('gx-0')).toBe(true);
     expect(wrapper.hasClass('row')).toBe(true);
   });