diff --git a/lemur/certificates/models.py b/lemur/certificates/models.py
index 965f79d1..d2414821 100644
--- a/lemur/certificates/models.py
+++ b/lemur/certificates/models.py
@@ -71,21 +71,21 @@ def get_sequence(name):
 
 
 def get_or_increase_name(name, serial):
-    certificates = Certificate.query.filter(
-        Certificate.name.ilike("{0}%".format(name))
-    ).all()
+    certificates = Certificate.query.filter(Certificate.name == name).all()
 
     if not certificates:
         return name
 
     serial_name = "{0}-{1}".format(name, hex(int(serial))[2:].upper())
-    certificates = Certificate.query.filter(
-        Certificate.name.ilike("{0}%".format(serial_name))
-    ).all()
+    certificates = Certificate.query.filter(Certificate.name == serial_name).all()
 
     if not certificates:
         return serial_name
 
+    certificates = Certificate.query.filter(
+        Certificate.name.ilike("{0}%".format(serial_name))
+    ).all()
+
     ends = [0]
     root, end = get_sequence(serial_name)
     for cert in certificates:
diff --git a/lemur/tests/test_certificates.py b/lemur/tests/test_certificates.py
index 07b5ee4e..adafa605 100644
--- a/lemur/tests/test_certificates.py
+++ b/lemur/tests/test_certificates.py
@@ -53,7 +53,8 @@ def test_get_or_increase_name(session, certificate):
         == "test-cert-11111111-1-" + serial
     )
 
-    cert2 = CertificateFactory(name="certificate1-" + serial)
+    CertificateFactory(name="certificate1")
+    CertificateFactory(name="certificate1-" + serial)
     session.commit()
 
     assert get_or_increase_name(