diff --git a/forms-bridge/deps/http b/forms-bridge/deps/http
index bdd6e145..71466126 160000
--- a/forms-bridge/deps/http
+++ b/forms-bridge/deps/http
@@ -1 +1 @@
-Subproject commit bdd6e145e266e12e6f423a764fc2720a43faa436
+Subproject commit 7146612614c8657ebf4d6c5b6fbf91d38d01250d
diff --git a/forms-bridge/includes/class-forms-bridge.php b/forms-bridge/includes/class-forms-bridge.php
index 3b6c14d3..b945d3cd 100644
--- a/forms-bridge/includes/class-forms-bridge.php
+++ b/forms-bridge/includes/class-forms-bridge.php
@@ -587,6 +587,11 @@ private static function notify_error(
 	 * Apply db migrations on plugin upgrades.
 	 */
 	private static function do_migrations() {
+		$action = sanitize_text_field( wp_unslash( $_POST['action'] ?? '' ) );
+		if ( 'heartbeat' === $action && wp_doing_ajax() ) {
+			return;
+		}
+
 		$from = get_option( self::DB_VERSION, self::version() );
 
 		if ( ! preg_match( '/^\d+\.\d+\.\d+$/', $from ) ) {
diff --git a/forms-bridge/migrations/3.0.0.php b/forms-bridge/migrations/3.0.0.php
index bde40baa..b91dc440 100644
--- a/forms-bridge/migrations/3.0.0.php
+++ b/forms-bridge/migrations/3.0.0.php
@@ -1,9 +1,19 @@
 <?php
+/**
+ * Database migration to version 3.0.0
+ *
+ * @package formsbridge
+ */
+
+// phpcs:disable WordPress.Files.FileName
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit();
 }
 
+/**
+ * Migration 3.0.0
+ */
 function forms_bridge_migration_300() {
 	$setting_names = array( 'rest-api', 'odoo', 'financoop', 'google-sheets' );
 
diff --git a/forms-bridge/migrations/3.0.4.php b/forms-bridge/migrations/3.0.4.php
index 53e12bce..cfcf4c34 100644
--- a/forms-bridge/migrations/3.0.4.php
+++ b/forms-bridge/migrations/3.0.4.php
@@ -1,9 +1,19 @@
 <?php
+/**
+ * Database migration to version 3.0.4
+ *
+ * @package formsbridge
+ */
+
+// phpcs:disable WordPress.Files.FileName
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit();
 }
 
+/**
+ * Migration 3.0.4
+ */
 function forms_bridge_migration_304() {
 	$setting_names = array( 'rest-api', 'odoo', 'financoop', 'google-sheets' );
 
diff --git a/forms-bridge/migrations/3.1.0.php b/forms-bridge/migrations/3.1.0.php
index 2afdcaf1..376504db 100644
--- a/forms-bridge/migrations/3.1.0.php
+++ b/forms-bridge/migrations/3.1.0.php
@@ -1,9 +1,19 @@
 <?php
+/**
+ * Database migration to version 3.1.0
+ *
+ * @package formsbridge
+ */
+
+// phpcs:disable WordPress.Files.FileName
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit();
 }
 
+/**
+ * Migration 3.1.0
+ */
 function forms_bridge_migration_310() {
 	$setting_names = array(
 		'rest-api',
diff --git a/forms-bridge/migrations/4.0.0.php b/forms-bridge/migrations/4.0.0.php
index b6544ce5..b2909828 100644
--- a/forms-bridge/migrations/4.0.0.php
+++ b/forms-bridge/migrations/4.0.0.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Database migration to version 4.0.0
+ *
+ * @package formsbridge
+ */
+
+// phpcs:disable WordPress.Files.FileName
 
 use FORMS_BRIDGE\Addon;
 
@@ -6,6 +13,9 @@
 	exit();
 }
 
+/**
+ * Migration 4.0.0
+ */
 function forms_bridge_migration_400() {
 	$setting_names = array(
 		'bigin',
@@ -245,7 +255,7 @@ function forms_bridge_migration_400() {
 	}
 
 	$registry = get_option( 'forms_bridge_addons' );
-	if ( $registry && is_array( $registry ) ) {
+	if ( isset( $registry['rest-api'] ) ) {
 		$registry['rest'] = $registry['rest-api'];
 		unset( $registry['rest-api'] );
 		update_option( 'forms_bridge_addons', $registry );
diff --git a/forms-bridge/migrations/4.0.7.php b/forms-bridge/migrations/4.0.7.php
index 28ebf886..a45f5721 100644
--- a/forms-bridge/migrations/4.0.7.php
+++ b/forms-bridge/migrations/4.0.7.php
@@ -1,14 +1,30 @@
 <?php
+/**
+ * Database migration to version 4.0.7
+ *
+ * @package formsbridge
+ */
+
+// phpcs:disable WordPress.Files.FileName
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit();
 }
 
+/**
+ * Migration 4.0.7
+ */
 function forms_bridge_migration_407() {
 	$http = get_option( 'http-bridge_general', array() ) ?: array(
 		'backends'    => array(),
 		'credentials' => array(),
 	);
 
-	update_option( 'forms-bridge_http', $http );
+	$result = update_option( 'forms-bridge_http', $http );
+
+	if ( $result ) {
+		delete_option( 'http-bridge_general' );
+	}
 }
+
+forms_bridge_migration_407();