diff --git a/kojihub/kojihub.py b/kojihub/kojihub.py
index 4ed88a7a..4696fd95 100644
--- a/kojihub/kojihub.py
+++ b/kojihub/kojihub.py
@@ -15592,8 +15592,10 @@ def create_rpm_checksum(rpm_id, sigkey, chsum_dict):
     checksum_type_int = [koji.CHECKSUM_TYPES[func] for func, _ in chsum_dict.items()]
     query = QueryProcessor(tables=['rpm_checksum'],
                            columns=['checksum_type', 'checksum', 'sigkey', 'rpm_id'],
-                           clauses=["checksum_type IN %(checksum_types)s", 'sigkey=%(sigkey)s'],
-                           values={'checksum_types': checksum_type_int, 'sigkey': sigkey})
+                           clauses=["checksum_type IN %(checksum_types)s", 'sigkey=%(sigkey)s',
+                                    'rpm_id = %(rpm_id)d'],
+                           values={'checksum_types': checksum_type_int, 'sigkey': sigkey,
+                                   'rpm_id': rpm_id})
     rows = query.execute()
     if len(rows) == len(checksum_type_int):
         return None
diff --git a/tests/test_hub/test_create_rpm_checksum.py b/tests/test_hub/test_create_rpm_checksum.py
index 9fd5524c..d8200c74 100644
--- a/tests/test_hub/test_create_rpm_checksum.py
+++ b/tests/test_hub/test_create_rpm_checksum.py
@@ -35,5 +35,5 @@ class TestCreateRPMChecksum(unittest.TestCase):
         query = self.queries[0]
         self.assertEqual(query.tables, ['rpm_checksum'])
         self.assertEqual(query.joins, None)
-        self.assertEqual(query.clauses,
-                         ["checksum_type IN %(checksum_types)s", "sigkey=%(sigkey)s"])
+        self.assertEqual(set(query.clauses), {"checksum_type IN %(checksum_types)s",
+                                              "sigkey=%(sigkey)s", "rpm_id = %(rpm_id)d"})