diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index ec4373dd..90c5221e 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -141,7 +141,8 @@ def main():
         # Potentially incorrect UCM
         if (curbuild and curbuild['commit']
                 and app['Update Check Mode'] == 'RepoManifest'
-                and curbuild['commit'] != 'unknown - see disabled'
+                and not curbuild['commit'].startswith('unknown')
+                and curbuild['vercode'] == app['Current Version Code']
                 and any(s in curbuild['commit'] for s in '.,_-/')):
             pwarn("Last used commit '%s' looks like a tag, but Update Check Mode is '%s'" % (
                 curbuild['commit'], app['Update Check Mode']))