diff --git a/dev-util/hip/files/hip-6.4.1-bad-assert.patch b/dev-util/hip/files/hip-6.4.1-bad-assert.patch
new file mode 100644
index 0000000000000..481da014f67c3
--- /dev/null
+++ b/dev-util/hip/files/hip-6.4.1-bad-assert.patch
@@ -0,0 +1,15 @@
+Remove invalid assert (caused random unittest failures in hiprt)
+
+Upstream bug: https://github.com/ROCm/clr/issues/148
+Backports commit: https://github.com/ROCm/clr/commit/8fcaa1ca938bf6e57625d3fae3f80b00e86df266
+--- a/rocclr/platform/commandqueue.cpp
++++ b/rocclr/platform/commandqueue.cpp
+@@ -156,8 +156,6 @@ void HostQueue::finish(bool cpu_wait) {
+   if (IS_HIP) {
+     command = getLastQueuedCommand(true);
+     if (command == nullptr) {
+-      assert(GetSubmissionBatch() == nullptr &&
+-        "Can't claim the queue is finished with the active batch!");
+       return;
+     }
+     // Force blocking wait if requested. That allows to avoid a build up of unreleased CPU commands
diff --git a/dev-util/hip/hip-6.4.1.ebuild b/dev-util/hip/hip-6.4.1-r1.ebuild
similarity index 99%
rename from dev-util/hip/hip-6.4.1.ebuild
rename to dev-util/hip/hip-6.4.1-r1.ebuild
index b1a1a69d3995a..e15f8c3737944 100644
--- a/dev-util/hip/hip-6.4.1.ebuild
+++ b/dev-util/hip/hip-6.4.1-r1.ebuild
@@ -82,6 +82,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.3.0-no-isystem-usr-include.patch"
 	"${FILESDIR}/${PN}-6.3.0-clr-fix-libcxx.patch"
 	"${FILESDIR}/${PN}-6.4.1-no-glibcxx-assert.patch"
+	"${FILESDIR}/${PN}-6.4.1-bad-assert.patch"
 )
 
 hip_test_wrapper() {