diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index 58df55250..dd086d079 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -175,7 +175,8 @@ class layoutAdminController extends layout
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$layout_config = new stdClass();
-		$layout_config->header_script = Context::get('header_script');
+		$layout_config->header_script = Context::get('header_script') ?? '';
+		$layout_config->header_script = Rhymix\Modules\Admin\Models\Utility::cleanHeaderAndFooterScripts($layout_config->header_script);
 		$oModuleController->insertModulePartConfig('layout',$args->layout_srl,$layout_config);
 		// Save a title of the menu
 		$extra_vars->menu_name_list = $menu_name_list;