diff --git a/config/common.mk b/config/common.mk
index 52e90867..6b3e3179 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -131,16 +131,17 @@ ifdef CM_RELEASE
     CM_BUILDTYPE := RELEASE
 endif
 
-ifdef CM_EXTRAVERSION
-    # Force build type to EXPERIMENTAL
-    CM_BUILDTYPE := EXPERIMENTAL
-    # Add leading dash to CM_EXTRAVERSION
-    CM_EXTRAVERSION := -$(CM_EXTRAVERSION)
-endif
-
-# If CM_BUILDTYPE is not defined, set to UNOFFICIAL
-ifndef CM_BUILDTYPE
+ifdef CM_BUILDTYPE
+    ifdef CM_EXTRAVERSION
+        # Force build type to EXPERIMENTAL
+        CM_BUILDTYPE := EXPERIMENTAL
+        # Add leading dash to CM_EXTRAVERSION
+        CM_EXTRAVERSION := -$(CM_EXTRAVERSION)
+    endif
+else
+    # If CM_BUILDTYPE is not defined, set to UNOFFICIAL
     CM_BUILDTYPE := UNOFFICIAL
+    CM_EXTRAVERSION :=
 endif
 
 ifdef CM_RELEASE