diff --git a/src/script.php b/src/script.php
index 17e6f1e..5496c17 100644
--- a/src/script.php
+++ b/src/script.php
@@ -34,8 +34,8 @@ class Tpl_MokoonyxInstallerScript implements InstallerScriptInterface
     private const OLD_DISPLAY = 'MokoCassiopeia';
     private const NEW_DISPLAY = 'MokoOnyx';
 
-    /** @var array Download keys saved before Joomla wipes update sites */
-    private array $savedDownloadKeys = [];
+    
+    
 
     public function preflight(string $type, InstallerAdapter $parent): bool
     {
@@ -86,14 +86,14 @@ class Tpl_MokoonyxInstallerScript implements InstallerScriptInterface
     public function uninstall(InstallerAdapter $parent): bool
     {
         $this->logMessage('MokoOnyx template uninstalled.');
-        $this->savedDownloadKeys = $this->backupDownloadKeys();
+        $this->saveDownloadKey();
 
         return true;
     }
 
     public function postflight(string $type, InstallerAdapter $parent): bool
     {
-        $this->restoreDownloadKeys($this->savedDownloadKeys);
+        $this->restoreDownloadKey();
         $this->warnMissingLicenseKey();
 
         if ($type === 'install' || $type === 'update') {
@@ -693,102 +693,91 @@ class Tpl_MokoonyxInstallerScript implements InstallerScriptInterface
         Log::add($message, $priorities[$priority] ?? Log::INFO, 'mokoonyx');
     }
 
-    private function backupDownloadKeys(): array
-    {
-        $keys = [];
 
-        try
-        {
-            $db = Factory::getDbo();
-            $db->setQuery(
-                $db->getQuery(true)
-                    ->select(['us.' . $db->quoteName('update_site_id'), 'us.' . $db->quoteName('extra_query'), 'us.' . $db->quoteName('location'), 'e.' . $db->quoteName('element')])
-                    ->from($db->quoteName('#__update_sites', 'us'))
-                    ->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON us.update_site_id = use.update_site_id')
-                    ->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
-                    ->where($db->quoteName('us.extra_query') . ' != ' . $db->quote(''))
-            );
+	private ?string $savedDownloadKey = null;
 
-            foreach ($db->loadObjectList() ?: [] as $row)
-            {
-                $keys['elem_' . $row->element] = $row->extra_query;
-                $keys[$row->location] = $row->extra_query;
-                $keys['id_' . $row->update_site_id] = $row->extra_query;
-            }
-        }
-        catch (\Throwable $e) {}
+	private function saveDownloadKey(): void
+	{
+		try
+		{
+			$db = \Joomla\CMS\Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select($db->quoteName('us.extra_query'))
+					->from($db->quoteName('#__update_sites', 'us'))
+					->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
+					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+					->where($db->quoteName('e.element') . ' = ' . $db->quote('mokoonyx'))
+					->setLimit(1)
+			);
+			$key = $db->loadResult();
+			if (!empty($key)) { $this->savedDownloadKey = $key; }
+		}
+		catch (\Throwable $e) {}
+	}
 
-        return $keys;
-    }
+	private function restoreDownloadKey(): void
+	{
+		if ($this->savedDownloadKey === null) { return; }
 
-    private function restoreDownloadKeys(array $savedKeys): void
-    {
-        if (empty($savedKeys)) { return; }
+		try
+		{
+			$db = \Joomla\CMS\Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select($db->quoteName('us.update_site_id'))
+					->from($db->quoteName('#__update_sites', 'us'))
+					->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
+					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+					->where($db->quoteName('e.element') . ' = ' . $db->quote('mokoonyx'))
+					->setLimit(1)
+			);
+			$siteId = (int) $db->loadResult();
+			if ($siteId > 0)
+			{
+				$db->setQuery(
+					$db->getQuery(true)
+						->update($db->quoteName('#__update_sites'))
+						->set($db->quoteName('extra_query') . ' = ' . $db->quote($this->savedDownloadKey))
+						->where($db->quoteName('update_site_id') . ' = ' . $siteId)
+				)->execute();
+			}
+		}
+		catch (\Throwable $e) {}
+	}
 
-        try
-        {
-            $db = Factory::getDbo();
-            $db->setQuery(
-                $db->getQuery(true)
-                    ->select(['us.' . $db->quoteName('update_site_id'), 'us.' . $db->quoteName('extra_query'), 'us.' . $db->quoteName('location'), 'e.' . $db->quoteName('element')])
-                    ->from($db->quoteName('#__update_sites', 'us'))
-                    ->join('LEFT', $db->quoteName('#__update_sites_extensions', 'use') . ' ON us.update_site_id = use.update_site_id')
-                    ->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
-                    ->where('(' . $db->quoteName('us.extra_query') . ' = ' . $db->quote('') . ' OR ' . $db->quoteName('us.extra_query') . ' NOT LIKE ' . $db->quote('%dlid=%') . ')')
-            );
+	private function warnMissingLicenseKey(): void
+	{
+		try
+		{
+			$db = \Joomla\CMS\Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')])
+					->from($db->quoteName('#__update_sites'))
+					->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoOnyx%') . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoOnyx%') . ')')
+					->setLimit(1)
+			);
+			$site = $db->loadObject();
 
-            $restored = 0;
+			if ($site)
+			{
+				$eq = (string) ($site->extra_query ?? '');
+				if (!empty($eq) && strpos($eq, 'dlid=') !== false) { parse_str($eq, $p); if (!empty($p['dlid'])) { return; } }
+				$editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
+			}
+			else
+			{
+				$editUrl = 'index.php?option=com_installer&view=updatesites';
+			}
 
-            foreach ($db->loadObjectList() ?: [] as $site)
-            {
-                $element = (string) ($site->element ?? '');
-                $key = ($element !== '') ? ($savedKeys['elem_' . $element] ?? '') : '';
-                if (empty($key)) { $key = $savedKeys[$site->location] ?? $savedKeys['id_' . $site->update_site_id] ?? ''; }
-
-                if (!empty($key))
-                {
-                    $db->setQuery($db->getQuery(true)->update($db->quoteName('#__update_sites'))->set($db->quoteName('extra_query') . ' = ' . $db->quote($key))->where($db->quoteName('update_site_id') . ' = ' . (int) $site->update_site_id))->execute();
-                    $restored++;
-                }
-            }
-
-            if ($restored > 0) { Factory::getApplication()->enqueueMessage(sprintf('Restored %d download key(s).', $restored), 'message'); }
-        }
-        catch (\Throwable $e) {}
-    }
-
-    private function warnMissingLicenseKey(): void
-    {
-        try
-        {
-            $db = Factory::getDbo();
-            $db->setQuery(
-                $db->getQuery(true)
-                    ->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')])
-                    ->from($db->quoteName('#__update_sites'))
-                    ->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoOnyx%') . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoOnyx%') . ')')
-                    ->setLimit(1)
-            );
-            $site = $db->loadObject();
-
-            if ($site)
-            {
-                $eq = (string) ($site->extra_query ?? '');
-                if (!empty($eq) && strpos($eq, 'dlid=') !== false) { parse_str($eq, $p); if (!empty($p['dlid'])) { return; } }
-                $editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
-            }
-            else
-            {
-                $editUrl = 'index.php?option=com_installer&view=updatesites';
-            }
-
-            Factory::getApplication()->enqueueMessage(
-                '<strong>Moko Consulting License Key Required</strong> — '
-                . 'No download key is configured. Updates will not be available until a valid license key is entered. '
-                . '<a href="' . $editUrl . '" class="btn btn-sm btn-warning ms-2">Enter License Key</a>',
-                'warning'
-            );
-        }
-        catch (\Throwable $e) {}
-    }
+			\Joomla\CMS\Factory::getApplication()->enqueueMessage(
+				'<strong>Moko Consulting License Key Required</strong> — '
+				. 'No download key is configured. Updates will not be available until a valid license key is entered. '
+				. '<a href="' . $editUrl . '" class="btn btn-sm btn-warning ms-2">Enter License Key</a>',
+				'warning'
+			);
+		}
+		catch (\Throwable $e) {}
+	}
 }