diff --git a/composer.lock b/composer.lock
index d48fb483d17..fe4bcdb2df0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2337,25 +2337,27 @@
         },
         {
             "name": "php-stubs/wordpress-stubs",
-            "version": "v6.3.2",
+            "version": "v6.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-stubs/wordpress-stubs.git",
-                "reference": "f22b00cacd3b9addc2b07ff48290084503c48574"
+                "reference": "6d6063cf9464a306ca2a0529705d41312b08500b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/f22b00cacd3b9addc2b07ff48290084503c48574",
-                "reference": "f22b00cacd3b9addc2b07ff48290084503c48574",
+                "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/6d6063cf9464a306ca2a0529705d41312b08500b",
+                "reference": "6d6063cf9464a306ca2a0529705d41312b08500b",
                 "shasum": ""
             },
             "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
                 "nikic/php-parser": "^4.13",
                 "php": "^7.4 || ~8.0.0",
                 "php-stubs/generator": "^0.8.3",
                 "phpdocumentor/reflection-docblock": "^5.3",
                 "phpstan/phpstan": "^1.10.12",
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^9.5",
+                "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.8"
             },
             "suggest": {
                 "paragonie/sodium_compat": "Pure PHP implementation of libsodium",
@@ -2376,9 +2378,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-stubs/wordpress-stubs/issues",
-                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.3.2"
+                "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.4.1"
             },
-            "time": "2023-10-14T10:08:05+00:00"
+            "time": "2023-11-10T00:33:47+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index aab1da67e42..8aee5a019ee 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -912,8 +912,11 @@ static function() {
 
 		if ( class_exists( 'Gutenberg_Modules' ) ) {
 			remove_action( 'wp_head', [ 'Gutenberg_Modules', 'print_import_map' ] );
+			remove_action( 'wp_footer', [ 'Gutenberg_Modules', 'print_import_map' ] );
 			remove_action( 'wp_head', [ 'Gutenberg_Modules', 'print_enqueued_modules' ] );
+			remove_action( 'wp_footer', [ 'Gutenberg_Modules', 'print_enqueued_modules' ] );
 			remove_action( 'wp_head', [ 'Gutenberg_Modules', 'print_module_preloads' ] );
+			remove_action( 'wp_footer', [ 'Gutenberg_Modules', 'print_module_preloads' ] );
 			remove_action( 'wp_footer', [ 'Gutenberg_Modules', 'print_import_map_polyfill' ], 11 );
 		}
 	}