diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 1142818a..f9f55d22 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -88,7 +88,7 @@ def main():
                 lastcommit = build['commit']
 
         # Potentially incorrect UCM
-        if (app['Update Check Mode'] in ['RepoManifest', 'None'] and
+        if (app['Update Check Mode'].startswith('RepoManifest') and
                 any(s in lastcommit for s in ('.', ',', '_', '-', '/'))):
             warn("Last used commit '%s' looks like a tag, but Update Check Mode is '%s'" % (
                 lastcommit, app['Update Check Mode']))