diff --git a/lib/server/versionFallback.js b/lib/server/versionFallback.js
index e6dac97705..19e75adbd7 100644
--- a/lib/server/versionFallback.js
+++ b/lib/server/versionFallback.js
@@ -120,7 +120,14 @@ files.forEach(file => {
   if (!(metadata.original_id in available)) {
     available[metadata.original_id] = new Set();
   }
-  const version = metadata.id.split('-')[1];
+  // The version will be between "version-" and "-<metadata.original_id>"
+  // e.g. version-1.0.0-beta.2-doc1 => 1.0.0-beta.2
+  // e.g. version-1.0.0-doc2 => 1.0.0
+  // e.g. version-1.0.0-getting-started => 1.0.0
+  const version = metadata.id.substring(
+    metadata.id.indexOf('version-') + 8, // version- is 8 characters
+    metadata.id.lastIndexOf('-' + metadata.original_id)
+  );
   available[metadata.original_id].add(version);
 
   if (!(version in versionFiles)) {