diff --git a/admin.php b/admin.php
index 365221948..414de6ca8 100644
--- a/admin.php
+++ b/admin.php
@@ -237,8 +237,12 @@ class="one-third" value="<?= $settings['smtp_port'] ?>" />
 
     <?php
     // Get latest version from admin table
-    $latestVersion = $settings['latest_version'];
-    $hasUpdate = version_compare($version, $latestVersion) == -1;
+    if (!is_null($settings['latest_version'])) {
+        $latestVersion = $settings['latest_version'];
+        $hasUpdate = version_compare($version, $latestVersion) == -1;
+    } else {
+        $hasUpdate = false;
+    }
 
     // find unused upload logos
     
diff --git a/includes/version.php b/includes/version.php
index 9884b3c70..dc380584f 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-$version = "v2.21.0";
+$version = "v2.21.1";
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 0d00cd308..b35fa6d55 100644
--- a/index.php
+++ b/index.php
@@ -73,12 +73,17 @@
 
 <section class="contain">
   <?php
-  if ($isAdmin && $settings['update_notification'] && version_compare($version, $settings['latest_version']) == -1) {
-    ?>
-    <div class="update-banner">
-      <?= translate('new_version_available', $i18n) ?>: <span><?= $settings['latest_version'] ?></span>
-    </div>
-    <?php
+  if ($isAdmin && $settings['update_notification']) {
+    if (!is_null($settings['latest_version'])) {
+      $latestVersion = $settings['latest_version'];
+      if (version_compare($version, $latestVersion) == -1) {
+        ?>
+        <div class="update-banner">
+          <?= translate('new_version_available', $i18n) ?>: <span><?= $latestVersion ?></span>
+        </div>
+        <?php
+      }
+    }
   }
   ?>
 
@@ -219,7 +224,8 @@
               id="sort-category_id"><?= translate('category', $i18n) ?></li>
             <li <?= $sortOrder == "payment_method_id" ? 'class="selected"' : "" ?>
               onClick="setSortOption('payment_method_id')" id="sort-payment_method_id">
-              <?= translate('payment_method', $i18n) ?></li>
+              <?= translate('payment_method', $i18n) ?>
+            </li>
             <?php
             if (!isset($settings['hideDisabledSubscriptions']) || $settings['hideDisabledSubscriptions'] !== 'true') {
               ?>
diff --git a/migrations/000025.php b/migrations/000025.php
index f46f4a52c..26d0afdbc 100644
--- a/migrations/000025.php
+++ b/migrations/000025.php
@@ -14,7 +14,7 @@
 $columnRequired = $columnQuery->fetchArray(SQLITE3_ASSOC) === false;
 
 if ($columnRequired) {
-    $db->exec('ALTER TABLE admin ADD COLUMN latest_version TEXT');
+    $db->exec("ALTER TABLE admin ADD COLUMN latest_version TEXT DEFAULT 'v2.21.1'");
 }
 
 $columnQuery = $db->query("SELECT * FROM pragma_table_info('admin') where name='update_notification'");
diff --git a/scripts/admin.js b/scripts/admin.js
index 2d89161b3..8a267515a 100644
--- a/scripts/admin.js
+++ b/scripts/admin.js
@@ -305,6 +305,9 @@ function toggleUpdateNotification() {
   .then(data => {
     if (data.success) {
       showSuccessMessage(data.message);
+      if (notificationEnabled === 1) {
+        fetch('endpoints/cronjobs/checkforupdates.php');
+      }
     } else {
       showErrorMessage(data.message);
     }