diff --git a/Source/LibationFileManager/Templates/CultureInfoDto.cs b/Source/LibationFileManager/Templates/CultureInfoDto.cs
index 277f6b9e..0646cc9f 100644
--- a/Source/LibationFileManager/Templates/CultureInfoDto.cs
+++ b/Source/LibationFileManager/Templates/CultureInfoDto.cs
@@ -14,12 +14,14 @@ public record CultureInfoDto : IFormattable
 
 	public static CultureInfoDto OfCurrentUi()
 	{
-		return new CultureInfoDto(CultureInfo.DefaultThreadCurrentUICulture ?? CultureInfo.CurrentUICulture, CultureInfo.CurrentUICulture.Name, "{N}");
+		var culture = CultureInfo.CurrentUICulture;
+		return new CultureInfoDto(culture, culture.Name, "{N}");
 	}
 
 	public static CultureInfoDto OfCurrentOs()
 	{
-		return new CultureInfoDto(CultureInfo.DefaultThreadCurrentCulture ?? CultureInfo.CurrentCulture, CultureInfo.CurrentCulture.Name, "{N}");
+		var culture = CultureInfo.CurrentCulture;
+		return new CultureInfoDto(culture, culture.Name, "{N}");
 	}
 
 	public CultureInfoDto(string hint) : this(hint, "{O}")
diff --git a/Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs b/Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs
index bb326ebe..680c36d1 100644
--- a/Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs
+++ b/Source/_Tests/LibationFileManager.Tests/TemplatesTests.cs
@@ -954,8 +954,12 @@ namespace TemplatesTests
 
 			var old = Thread.CurrentThread.CurrentCulture;
 			var oldUi = Thread.CurrentThread.CurrentUICulture;
+			var oldDefault = CultureInfo.DefaultThreadCurrentCulture;
+			var oldDefaultUi = CultureInfo.DefaultThreadCurrentUICulture;
 			try
 			{
+				CultureInfo.DefaultThreadCurrentCulture = null;
+				CultureInfo.DefaultThreadCurrentUICulture = null;
 				Thread.CurrentThread.CurrentCulture = new CultureInfo("sv-SE");
 				Thread.CurrentThread.CurrentUICulture = new CultureInfo("es-ES");
 				Templates.TryGetTemplate<Templates.FileTemplate>(template, out var fileTemplate).Should().BeTrue();
@@ -966,6 +970,8 @@ namespace TemplatesTests
 			{
 				Thread.CurrentThread.CurrentCulture = old;
 				Thread.CurrentThread.CurrentUICulture = oldUi;
+				CultureInfo.DefaultThreadCurrentCulture = oldDefault;
+				CultureInfo.DefaultThreadCurrentUICulture = oldDefaultUi;
 			}
 
 			result.Should().Be(expected);