diff --git a/src/qz/utils/WindowsUtilities.java b/src/qz/utils/WindowsUtilities.java
index a2176802c..a6c15fa4f 100644
--- a/src/qz/utils/WindowsUtilities.java
+++ b/src/qz/utils/WindowsUtilities.java
@@ -79,11 +79,16 @@ public static Version getOsVersion() {
             build = getRegInt(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "UBR").toString();
         }
 
-        return Version.forIntegers(
+        Version osVersion = Version.forIntegers(
                 versionInfo.dwMajorVersion.intValue(),
                 versionInfo.dwMinorVersion.intValue(),
                 versionInfo.dwBuildNumber.intValue()
-        ).setBuildMetadata(build);
+        );
+
+        if(!build.trim().isEmpty()) {
+            osVersion.setBuildMetadata(build);
+        }
+        return osVersion;
     }
 
     /**