diff --git a/components/com_contact/tmpl/form/edit.php b/components/com_contact/tmpl/form/edit.php
index cdb20b89ae85d..aa42bd971c9b6 100644
--- a/components/com_contact/tmpl/form/edit.php
+++ b/components/com_contact/tmpl/form/edit.php
@@ -22,7 +22,7 @@
 $this->ignore_fieldsets = array('details', 'item_associations', 'language');
 $this->useCoreUI        = true;
 ?>
-<div class="edit item-page<?php echo $this->pageclass_sfx; ?>">
+<div class="edit item-page<?php echo $this->pageclass_sfx ? ' ' . $this->pageclass_sfx : ''; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<div class="page-header">
 			<h1>
diff --git a/components/com_content/tmpl/article/default.php b/components/com_content/tmpl/article/default.php
index 7f65fc7f5e8a4..7e3ea7144321e 100644
--- a/components/com_content/tmpl/article/default.php
+++ b/components/com_content/tmpl/article/default.php
@@ -33,7 +33,7 @@
 $isNotPublishedYet = $this->item->publish_up > $currentDate;
 $isExpired         = !is_null($this->item->publish_down) && $this->item->publish_down < $currentDate;
 ?>
-<div class="com-content-article item-page<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Article">
+<div class="com-content-article item-page<?php echo $this->pageclass_sfx ? ' ' . $this->pageclass_sfx : ''; ?>" itemscope itemtype="https://schema.org/Article">
 	<meta itemprop="inLanguage" content="<?php echo ($this->item->language === '*') ? Factory::getApplication()->get('language') : $this->item->language; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 	<div class="page-header">
diff --git a/components/com_privacy/tmpl/confirm/default.php b/components/com_privacy/tmpl/confirm/default.php
index 2f80026cadb9b..b753d8672678c 100644
--- a/components/com_privacy/tmpl/confirm/default.php
+++ b/components/com_privacy/tmpl/confirm/default.php
@@ -19,7 +19,7 @@
 HTMLHelper::_('behavior.formvalidator');
 
 ?>
-<div class="request-confirm<?php echo $this->pageclass_sfx; ?>">
+<div class="request-confirm<?php echo $this->pageclass_sfx ? ' ' . $this->pageclass_sfx : ''; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<div class="page-header">
 			<h1>
diff --git a/components/com_privacy/tmpl/remind/default.php b/components/com_privacy/tmpl/remind/default.php
index aa311d365ca9c..ea425a848f008 100644
--- a/components/com_privacy/tmpl/remind/default.php
+++ b/components/com_privacy/tmpl/remind/default.php
@@ -19,7 +19,7 @@
 HTMLHelper::_('behavior.formvalidator');
 
 ?>
-<div class="remind-confirm<?php echo $this->pageclass_sfx; ?>">
+<div class="remind-confirm<?php echo $this->pageclass_sfx ? ' ' . $this->pageclass_sfx : ''; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<div class="page-header">
 			<h1>
diff --git a/components/com_privacy/tmpl/request/default.php b/components/com_privacy/tmpl/request/default.php
index 44afcbb8d0a6d..1a34d1c28621b 100644
--- a/components/com_privacy/tmpl/request/default.php
+++ b/components/com_privacy/tmpl/request/default.php
@@ -19,7 +19,7 @@
 HTMLHelper::_('behavior.formvalidator');
 
 ?>
-<div class="request-form<?php echo $this->pageclass_sfx; ?>">
+<div class="request-form<?php echo $this->pageclass_sfx ? ' ' . $this->pageclass_sfx : ''; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<div class="page-header">
 			<h1>
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index ad83dbb1cfd7e..6446d362783f3 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -51,7 +51,7 @@
 
 $tagsData = $category->tags->itemTags;
 ?>
-<div class="<?php echo $className . '-category' . $displayData->pageclass_sfx; ?>">
+<div class="<?php echo $className . '-category'; ?><?php echo $displayData->pageclass_sfx ? ' ' . $displayData->pageclass_sfx : ''; ?>">
 	<?php if ($params->get('show_page_heading')) : ?>
 		<h1>
 			<?php echo $displayData->escape($params->get('page_heading')); ?>