diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
index 5dc7e9a557bcb..36994e6c5c549 100644
--- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
@@ -168,10 +168,14 @@ public function display($tpl = null)
 			}
 		}
 		// Here we have now two options: preupdatecheck or update
-		elseif ($this->getLayout() != 'update' || $isCritical)
+		elseif ($this->getLayout() != 'update' && ($isCritical || $this->shouldDisplayPreUpdateCheck()))
 		{
 			$this->setLayout('preupdatecheck');
 		}
+		else
+		{
+			$this->setLayout('update');
+		}
 
 		if (in_array($this->getLayout(), ['preupdatecheck', 'update', 'upload']))
 		{