diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php
index f1bf7ef154..0ed4a12326 100644
--- a/classes/controllers/FrmFormsController.php
+++ b/classes/controllers/FrmFormsController.php
@@ -1413,6 +1413,10 @@ private static function get_settings_tabs( $values ) {
 			),
 		);
 
+		if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
+			unset( $sections['buttons'] );
+		}
+
 		foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
 			if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
 				unset( $sections[ $feature ] );
diff --git a/classes/views/frm-forms/settings-buttons.php b/classes/views/frm-forms/settings-buttons.php
index ae14ef0119..916be7500c 100644
--- a/classes/views/frm-forms/settings-buttons.php
+++ b/classes/views/frm-forms/settings-buttons.php
@@ -2,11 +2,20 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
+
+// Do not deprecate if the Pro version still use these hooks.
+$should_deprecate_hook = ! class_exists( 'FrmProDb' ) || version_compare( FrmProDb::$plug_version, '6.16.3' ) >= 0;
 ?>
 <input type="hidden" name="options[custom_style]" value="<?php echo esc_attr( $values['custom_style'] ); ?>" />
 
 <table class="form-table">
-	<?php do_action( 'frm_add_form_style_tab_options', $values ); ?>
+	<?php
+	if ( $should_deprecate_hook ) {
+		do_action_deprecated( 'frm_add_form_style_tab_options', array( $values ), '6.16.3' );
+	} else {
+		do_action( 'frm_add_form_style_tab_options', $values );
+	}
+	?>
 	<tr>
 		<td colspan="2">
 			<h3><?php esc_html_e( 'Buttons', 'formidable' ); ?></h3>
@@ -19,5 +28,11 @@
 			</div>
 		</td>
 	</tr>
-	<?php do_action( 'frm_add_form_button_options', $values ); ?>
+	<?php
+	if ( $should_deprecate_hook ) {
+		do_action_deprecated( 'frm_add_form_button_options', array( $values ), '6.16.3' );
+	} else {
+		do_action( 'frm_add_form_button_options', $values );
+	}
+	?>
 </table>