diff --git a/Directory.Build.props b/Directory.Build.props
index e8f954fa3f..874e938056 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <PropertyGroup>
-        <Version>7.19.0</Version>
+        <Version>7.19.1</Version>
         <LangVersion>12.0</LangVersion>
         <Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
         <PackageIconUrl>https://martendb.io/logo.png</PackageIconUrl>
diff --git a/src/Marten/StoreOptions.cs b/src/Marten/StoreOptions.cs
index cf850b7289..bfa08a0876 100644
--- a/src/Marten/StoreOptions.cs
+++ b/src/Marten/StoreOptions.cs
@@ -153,6 +153,7 @@ public StoreOptions()
 
     public string MaybeCorrectTenantId(string tenantId)
     {
+        if (tenantId.IsEmpty()) return Marten.Storage.Tenancy.DefaultTenantId;
         if (tenantId == Marten.Storage.Tenancy.DefaultTenantId) return tenantId;
 
         switch (TenantIdStyle)