diff --git a/live/live-root/usr/bin/live-self-update b/live/live-root/usr/bin/live-self-update
index a9354f18b6..472ee9c956 100755
--- a/live/live-root/usr/bin/live-self-update
+++ b/live/live-root/usr/bin/live-self-update
@@ -250,9 +250,14 @@ install_updates() {
     query_reg_server
 
     # repo from the registration server
-    if [ -s "$REG_REPO_FILE" ]; then
-      prepare_chroot
-      add_update_repos "$REG_REPO_FILE"
+    if [ -f "$REG_REPO_FILE" ]; then
+      if [ -s "$REG_REPO_FILE" ]; then
+        prepare_chroot
+        add_update_repos "$REG_REPO_FILE"
+      else
+        milestone "No repository found in the registration server, skipping self-update"
+        exit 0
+      fi
     # use a fallback URL
     elif [ -s "$CONFIG_FALLBACK_FILE" ]; then
       milestone "Using fallback repository"
diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes
index a677f63a02..99cf675c8b 100644
--- a/live/src/agama-installer.changes
+++ b/live/src/agama-installer.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 12 14:57:21 UTC 2026 - Ladislav Slezák <lslezak@suse.com>
+
+- Fixed failing self-update, the self-update repository is not
+  ready yet. If SCC returns empty response then do not try using
+  the fallback URL and skip the self-update process. (bsc#1258142)
+
 -------------------------------------------------------------------
 Wed Feb 11 14:45:20 UTC 2026 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>