diff --git a/functions.php b/functions.php
index 4e34bf77670d38957a914829a19f4c63679294af..65b2de78dfb30d2b2a296e9a36dccd8179cbc240 100644
--- a/functions.php
+++ b/functions.php
@@ -7,6 +7,7 @@ if ( file_exists( __DIR__. '/functions_add.php' ) ) {
 }
 
 include __DIR__ . '/functions_rest_api.php';
+include __DIR__ . '/functions_flexible_shipping.php';
 
 /**
  * Disable images regenerations
diff --git a/functions_flexible_shipping.php b/functions_flexible_shipping.php
new file mode 100644
index 0000000000000000000000000000000000000000..58f1d46e9984e22e635a0d7d43744858756eccf5
--- /dev/null
+++ b/functions_flexible_shipping.php
@@ -0,0 +1,19 @@
+<?php
+
+add_filter( 'flexible-shipping/group-method/supports/shipping-zones', function ( $status ) {
+	$option_value = get_option( 'wpdesk_flexible_shipping_group_method_supports_shipping_zones', '' );
+	if ( $option_value ) {
+		return true;
+	}
+
+	return $status;
+} );
+
+add_filter( 'flexible-shipping/group-method/supports/edit', function ( $status ) {
+	$option_value = get_option( 'wpdesk_flexible_shipping_group_method_supports_edit', '' );
+	if ( $option_value ) {
+		return true;
+	}
+
+	return $status;
+} );