diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 06d766fec..0a2eb1f35 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -242,7 +242,7 @@ class Context
 		else
 		{
 			$site_module_info = new stdClass;
-			$site_module_info->domain = $_SERVER['HTTP_HOST'];
+			$site_module_info->domain = Rhymix\Framework\URL::getCurrentDomain();
 			$site_module_info->security = RX_SSL ? 'always' : 'none';
 			$site_module_info->settings = new stdClass;
 			$site_module_info->is_default_replaced = true;
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 7a50281c7..5b910d223 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -147,7 +147,11 @@ class ModuleHandler extends Handler
 						return true;
 
 					case 'display':
-						// pass
+						$site_module_info->domain_srl = -1;
+						$site_module_info->domain = Rhymix\Framework\URL::getCurrentDomain();
+						$site_module_info->is_default_domain = 'N';
+						$site_module_info->is_default_replaced = true;
+						Context::set('site_module_info', $site_module_info);
 				}
 			}
 		}