diff --git a/routers/web/repo/updateserver.go b/routers/web/repo/updateserver.go
index 59f6a14203..29a6b77355 100644
--- a/routers/web/repo/updateserver.go
+++ b/routers/web/repo/updateserver.go
@@ -94,7 +94,9 @@ func ServeUpdatesXML(ctx *context.Context) {
 	}
 
 	repoCfg, _ := licenses.GetRepoConfig(ctx, ctx.Repo.Repository.ID)
-	requireKey := repoCfg != nil && repoCfg.RequireKey
+	// Show <downloadkey> when licensing is enabled (prepares Joomla to accept keys)
+	// or when require_key is explicitly set.
+	requireKey := repoCfg != nil && (repoCfg.LicensingEnabled || repoCfg.RequireKey)
 
 	xmlData, err := updateserver.GenerateJoomlaXML(ctx, ctx.Repo.Repository, requireKey, stripDownloads, allowedChannels...)
 	if err != nil {