diff --git a/build.gradle b/build.gradle
index d4cab9388338658f336c0e8445167d9fcb00ecfe..c33b5646a909236871edbba7bb9bdeb0c09526e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,8 +119,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 42024 + grgit.tag.list().size()
-        versionName grgit.describe(tags: true, always: true)
+        versionCode 42024 + grgit.tag.list().findAll { it.dateTime != null }.size()
+        versionName grgit.describe(always: true)
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
         def appName = "Conversations"