diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 35eed12f3..72970365d 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -390,6 +390,7 @@ class ModuleHandler extends Handler
 		if($this->module_info->use_mobile !== 'Y')
 		{
 			Mobile::setMobile(FALSE);
+			$this->is_mobile = Mobile::isFromMobilePhone();
 		}
 
 		$logged_info = Context::get('logged_info');
@@ -416,6 +417,7 @@ class ModuleHandler extends Handler
 			{
 				$type = $orig_type;
 				Mobile::setMobile(FALSE);
+				$this->is_mobile = Mobile::isFromMobilePhone();
 				$oModule = self::getModuleInstance($this->module, $type, $kind);
 			}
 		}
@@ -533,6 +535,7 @@ class ModuleHandler extends Handler
 					{
 						$type = $orig_type;
 						Mobile::setMobile(FALSE);
+						$this->is_mobile = Mobile::isFromMobilePhone();
 						$oModule = self::getModuleInstance($forward->module, $type, $kind);
 					}
 				}