diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 6d4cc630f..392f80db9 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -209,6 +209,10 @@ class addonAdminController extends addonController
 			$args->{$key} = $vars->{$key} ?? '';
 		}
 		$args->xe_run_method = $vars->xe_run_method ?? '';
+		if (!in_array($args->xe_run_method, ['run_selected', 'no_run_selected']))
+		{
+			$args->xe_run_method = 'run_selected';
+		}
 		$args->mid_list = $vars->mid_list ?? [];
 
 		$output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index c8225c69a..19b95395c 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -102,8 +102,8 @@ class addonController extends addon
 			$buff[] = '$before_time = microtime(true);';
 
 			// Run method and mid list
-			$run_method = ($extra_vars->xe_run_method ?? null) ?: 'run_selected';
-			$buff[] = '$rm = \'' . $run_method . "';";
+			$run_method = strval($extra_vars->xe_run_method ?? 'run_selected');
+			$buff[] = '$rm = ' . var_export($run_method, true) . ';';
 			$buff[] = '$ml = ' . var_export(array_fill_keys($mid_list, true), true) . ';';
 			$buff[] = '$_m = Context::get(\'mid\');';