diff --git a/modules/page/m.skins/default/mobile.html b/modules/page/m.skins/default/mobile.html
index 85984b8b6..02011ab25 100644
--- a/modules/page/m.skins/default/mobile.html
+++ b/modules/page/m.skins/default/mobile.html
@@ -1,2 +1,2 @@
-
{$oDocument->getTitle()}
-{$oDocument->getContent($module_info->display_popupmenu != 'hide')}
+{$oDocument->getTitle()}
+{$oDocument->getContent(($module_info->display_popupmenu ?? '') !== 'hide')}
diff --git a/modules/page/page.mobile.php b/modules/page/page.mobile.php
index b1969a879..78d5a2f5b 100644
--- a/modules/page/page.mobile.php
+++ b/modules/page/page.mobile.php
@@ -7,10 +7,8 @@ class PageMobile extends PageView
{
$oTemplate = &TemplateHandler::getInstance();
- $oDocumentModel = getModel('document');
- $oDocument = $oDocumentModel->getDocument(0);
-
- if($this->module_info->mdocument_srl)
+ $oDocument = DocumentModel::getDocument(0);
+ if($this->module_info->mdocument_srl ?? 0)
{
$document_srl = $this->module_info->mdocument_srl;
$oDocument->setDocument($document_srl);
diff --git a/modules/page/page.view.php b/modules/page/page.view.php
index 41513e23b..8e26a2f6b 100644
--- a/modules/page/page.view.php
+++ b/modules/page/page.view.php
@@ -143,10 +143,8 @@ class PageView extends Page
{
$oTemplate = &TemplateHandler::getInstance();
- $oDocumentModel = getModel('document');
- $oDocument = $oDocumentModel->getDocument(0);
-
- if($this->module_info->document_srl)
+ $oDocument = DocumentModel::getDocument(0);
+ if($this->module_info->document_srl ?? 0)
{
$document_srl = $this->module_info->document_srl;
$oDocument->setDocument($document_srl);
diff --git a/modules/page/skins/default/content.html b/modules/page/skins/default/content.html
index 8fa98b30e..d9ed2c234 100644
--- a/modules/page/skins/default/content.html
+++ b/modules/page/skins/default/content.html
@@ -1,6 +1,6 @@
-{$oDocument->getTitle()}
-{$oDocument->getContent($module_info->display_popupmenu != 'hide')}
+{$oDocument->getTitle()}
+{$oDocument->getContent(($module_info->display_popupmenu ?? '') !== 'hide')}
{$lang->none_content}