diff --git a/ui/app/components/button-group/button-group.component.js b/ui/app/components/button-group/button-group.component.js
index 905bbe9d2..440b3c4f7 100644
--- a/ui/app/components/button-group/button-group.component.js
+++ b/ui/app/components/button-group/button-group.component.js
@@ -14,12 +14,13 @@ export default class ButtonGroup extends PureComponent {
 
   static defaultProps = {
     className: 'button-group',
+    defaultActiveButtonIndex: 0,
   }
 
   state = {
     activeButtonIndex: this.props.noButtonActiveByDefault
       ? null
-      : this.props.defaultActiveButtonIndex || 0,
+      : this.props.defaultActiveButtonIndex,
   }
 
   handleButtonClick (activeButtonIndex) {
diff --git a/ui/app/components/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js b/ui/app/components/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js
index 99ef28b5e..164da4a32 100644
--- a/ui/app/components/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js
+++ b/ui/app/components/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js
@@ -16,11 +16,11 @@ export default class BasicTabContent extends Component {
       <div className="basic-tab-content">
         <div className="basic-tab-content__title">Suggest gas fee increases</div>
         <GasPriceButtonGroup
-          {...this.props.gasPriceButtonGroupProps}
           className="gas-price-button-group"
           noButtonActiveByDefault={true}
           showCheck={true}
           handleGasPriceSelection={(newPrice) => console.log('New Price:', newPrice)}
+          {...this.props.gasPriceButtonGroupProps}
         />
       </div>
     )