diff --git a/library/includes/functions.php b/library/includes/functions.php
index 1cfd7296f..a916f408c 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -997,7 +997,7 @@ function make_jumpbox(): void
         return;
     }
 
-    if (!$jumpbox = $datastore->get('jumpbox')) {
+    if (!$jumpbox = $datastore->get('jumpbox') and !$datastore->has('jumpbox')) {
         $datastore->update('jumpbox');
         $jumpbox = $datastore->get('jumpbox');
     }