diff --git a/0003-Propagate-return-value-from-prepare_repo_download_ta.patch b/0003-Propagate-return-value-from-prepare_repo_download_ta.patch
new file mode 100644
index 0000000..fcdd178
--- /dev/null
+++ b/0003-Propagate-return-value-from-prepare_repo_download_ta.patch
@@ -0,0 +1,31 @@
+From 089eac540f395db8303e42bc9716a14851b1132c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
+Date: Mon, 9 Jun 2025 09:25:39 +0200
+Subject: [PATCH] Propagate return value from `prepare_repo_download_targets`
+
+It also ensures that when return value is false there is some error set.
+---
+ librepo/yum.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/librepo/yum.c b/librepo/yum.c
+index 56bca3e..482d4d9 100644
+--- a/librepo/yum.c
++++ b/librepo/yum.c
+@@ -961,7 +961,12 @@ lr_yum_download_repo(LrHandle *handle,
+ 
+     assert(!err || *err == NULL);
+ 
+-    prepare_repo_download_targets(handle, repo, repomd, NULL, &targets, &cbdata_list, err);
++    ret = prepare_repo_download_targets(handle, repo, repomd, NULL, &targets, &cbdata_list, err);
++    if (!ret) {
++        assert(!err || *err != NULL);
++        return ret;
++    }
++    assert(!err || *err == NULL);
+ 
+     if (!targets)
+         return TRUE;
+-- 
+2.49.0
+
diff --git a/librepo.spec b/librepo.spec
index 9dda9af..bb4a57c 100644
--- a/librepo.spec
+++ b/librepo.spec
@@ -29,7 +29,7 @@
 
 Name:           librepo
 Version:        1.18.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Repodata downloading library
 
 License:        LGPL-2.1-or-later
@@ -37,6 +37,7 @@ URL:            https://github.com/rpm-software-management/librepo
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch1:         0001-Use-rpm-sequoia-on-RHEL-10.patch
 Patch2:         0002-Fix-a-memory-leak-in-select_next_target.patch
+Patch3:         0003-Propagate-return-value-from-prepare_repo_download_ta.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -129,6 +130,9 @@ Python 3 bindings for the librepo library.
 %{python3_sitearch}/%{name}/
 
 %changelog
+* Tue Jun 24 2025 Ales Matej <amatej@redhat.com> - 1.18.0-4
+- Propagate return value from prepare_repo_download_targets (RHEL-85338)
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.18.0-3
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018