diff --git a/src/Elastic.Codex/Page/Index.cshtml b/src/Elastic.Codex/Page/Index.cshtml
index 258db5b7ab..a7f1f08d7e 100644
--- a/src/Elastic.Codex/Page/Index.cshtml
+++ b/src/Elastic.Codex/Page/Index.cshtml
@@ -84,8 +84,11 @@
 	{
 		if (name == GlobalSections.Head)
 		{
-			<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
-			<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			@if (Model.CurrentVersion is not null)
+			{
+				<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
+				<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			}
 			<link rel="alternate" type="text/markdown" href="@(Model.MarkdownUrl)" title="Markdown export"/>
 			<script type="application/ld+json">
 	    	@(new HtmlString(Model.StructuredBreadcrumbsJson))
diff --git a/src/Elastic.Markdown/HtmlWriter.cs b/src/Elastic.Markdown/HtmlWriter.cs
index 51cea196f5..f65dfe6860 100644
--- a/src/Elastic.Markdown/HtmlWriter.cs
+++ b/src/Elastic.Markdown/HtmlWriter.cs
@@ -117,7 +117,9 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 			?? throw new InvalidOperationException($"No versioning system available for page '{markdown.RelativePath}'. " +
 				"Ensure VersionsConfiguration contains a Stack versioning system or the inferred product has a VersioningSystem defined.");
 
-		var currentBaseVersion = $"{pageVersioning.Base.Major}.{pageVersioning.Base.Minor}+";
+		var currentBaseVersion = pageVersioning.IsVersionless
+			? null
+			: $"{pageVersioning.Base.Major}.{pageVersioning.Base.Minor}+";
 
 		//TODO should we even distinctby
 		var breadcrumbs = parents.Reverse().DistinctBy(p => p.Url).ToArray();
diff --git a/src/Elastic.Markdown/Page/Index.cshtml b/src/Elastic.Markdown/Page/Index.cshtml
index b67112bf99..c73cdb6f55 100644
--- a/src/Elastic.Markdown/Page/Index.cshtml
+++ b/src/Elastic.Markdown/Page/Index.cshtml
@@ -67,8 +67,11 @@
 	{
 		if (name == GlobalSections.Head)
 		{
-			<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
-			<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			@if (Model.CurrentVersion is not null)
+			{
+				<meta class="elastic" name="product_version" content="@(new HtmlString(Model.CurrentVersion))"/>
+				<meta name="DC.identifier" content="@(new HtmlString(Model.CurrentVersion))"/>
+			}
 			<link rel="alternate" type="text/markdown" href="@(Model.MarkdownUrl)" title="Markdown export"/>
 			<script type="application/ld+json">
 	    	@(new HtmlString(Model.StructuredBreadcrumbsJson))
diff --git a/src/Elastic.Markdown/Page/IndexViewModel.cs b/src/Elastic.Markdown/Page/IndexViewModel.cs
index 13e116b0e5..f64968f5e1 100644
--- a/src/Elastic.Markdown/Page/IndexViewModel.cs
+++ b/src/Elastic.Markdown/Page/IndexViewModel.cs
@@ -36,7 +36,7 @@ public class IndexViewModel
 
 	public required string NavigationHtml { get; init; }
 
-	public required string CurrentVersion { get; init; }
+	public required string? CurrentVersion { get; init; }
 
 	public required string? AllVersionsUrl { get; init; }
 	public required LegacyPageMapping[]? LegacyPages { get; init; }