diff --git a/src/main.rs b/src/main.rs
index 280565b..16b3646 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -97,7 +97,19 @@ fn main() -> Result<()> {
     info!("Starting server at: {}", &bind);
 
     let state = routes::State {
-        vault_name: matches.value_of("VAULT_NAME").map(|s| s.to_string()),
+        vault_name: Some(
+            matches
+                .value_of("VAULT_NAME")
+                .map(|s| s.to_string())
+                .unwrap_or_else(|| {
+                    vault_path
+                        .iter()
+                        .last()
+                        .unwrap()
+                        .to_string_lossy()
+                        .into_owned()
+                }),
+        ),
         directory: vault_path.clone(),
         db_pool: db_pool.clone(),
         job_container: job_container.clone(),