diff --git a/src/views/gutenberg-blocks/blocks/item-gallery/save.js b/src/views/gutenberg-blocks/blocks/item-gallery/save.js
index d67f959fb..601cd49f0 100644
--- a/src/views/gutenberg-blocks/blocks/item-gallery/save.js
+++ b/src/views/gutenberg-blocks/blocks/item-gallery/save.js
@@ -1,3 +1,3 @@
 export default function() {
     return null
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php
index 4fac8f1af..5132285aa 100644
--- a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php
+++ b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php
@@ -249,14 +249,16 @@ function tainacan_blocks_add_common_theme_scripts() {
 	wp_localize_script( 'tainacan-blocks-common-scripts', 'tainacan_blocks', $block_settings);
 	wp_localize_script( 'tainacan-blocks-common-scripts', 'tainacan_plugin', $plugin_settings);
 
-	// Necessary while we don't have a better way to do this only
-	// when item submission block is present
-	tainacan_blocks_add_extra_item_submission_assets();
+	// Necessary do this only when the item submission block is present
+	function tainacan_enqueue_extra_item_submission_assets() {
+		if ( has_block( 'tainacan/item-submission-form', get_the_ID() ) )
+			tainacan_blocks_add_extra_item_submission_assets();
+	}
+	add_action('wp', 'tainacan_enqueue_extra_item_submission_assets');
 }
 
 /** 
- * Registers the extra scripts necessary for item submission block,
- * even on theme side :/
+ * Registers the extra scripts necessary for item submission block
  */
 function tainacan_blocks_add_extra_item_submission_assets() {
 	
@@ -266,6 +268,7 @@ function tainacan_blocks_add_extra_item_submission_assets() {
 		'https://www.google.com/recaptcha/api.js',
 		[], false, true 
 	);
+	
 	wp_enqueue_script('tainacan-google-recaptcha-script');
 
 	// Registers extra metadata type forms