diff --git a/Cargo.lock b/Cargo.lock
index a4665260d..4a35191d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1139,7 +1139,6 @@ dependencies = [
 name = "calimero-context"
 version = "0.1.0"
 dependencies = [
- "bs58 0.5.1",
  "calimero-blobstore",
  "calimero-context-config",
  "calimero-network",
diff --git a/crates/context/Cargo.toml b/crates/context/Cargo.toml
index c416ac046..ebe2494e6 100644
--- a/crates/context/Cargo.toml
+++ b/crates/context/Cargo.toml
@@ -7,7 +7,6 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
-bs58.workspace = true
 camino = { workspace = true, features = ["serde1"] }
 eyre.workspace = true
 futures-util.workspace = true
diff --git a/crates/context/src/lib.rs b/crates/context/src/lib.rs
index 67a1b266e..3aed44210 100644
--- a/crates/context/src/lib.rs
+++ b/crates/context/src/lib.rs
@@ -580,7 +580,7 @@ impl ContextManager {
             |meta| {
                 let context = Context::new(
                     context_id,
-                    meta.application.application_id(),
+                    application_id.unwrap_or_else(|| meta.application.application_id()),
                     meta.root_hash.into(),
                 );