diff --git a/flake.lock b/flake.lock
index 98b249dd86..b1f1ee09a4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "cardano-playground": {
       "flake": false,
       "locked": {
-        "lastModified": 1710374728,
-        "narHash": "sha256-nk79ZQLHGHPLXEYeJhZLWQWsa+wzOxxu4SuY9sKVG5c=",
+        "lastModified": 1720039830,
+        "narHash": "sha256-q3+XNKzeGJ9gj9tYnuR/vsJ2QDN9v1puCr52gFONTqU=",
         "owner": "input-output-hk",
         "repo": "cardano-playground",
-        "rev": "aa1d456c5e926cc07094a26f2c480773f206e4e8",
+        "rev": "b57678bfde5cba49b933b8bcec2af278a42ea3c2",
         "type": "github"
       },
       "original": {
@@ -36,16 +36,16 @@
     "cardano-wallet-unpatched": {
       "flake": false,
       "locked": {
-        "lastModified": 1714939252,
-        "narHash": "sha256-9n5/ufTrkT3RPF6S2diepEuEDKImEfCM6NbepoCLU2I=",
+        "lastModified": 1721216850,
+        "narHash": "sha256-qZ8Xw0r/CF0x8LCbV4VKzN1aFoIWc6bftIsjBnTdug8=",
         "owner": "cardano-foundation",
         "repo": "cardano-wallet",
-        "rev": "85c53a2f8c6cb10d2d44ab045b3c5e4fb7155e7a",
+        "rev": "4cbeaa7a861ddc1fd8f28179138989a2b5f66246",
         "type": "github"
       },
       "original": {
         "owner": "cardano-foundation",
-        "ref": "v2024-05-05",
+        "ref": "master",
         "repo": "cardano-wallet",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 33e8a131f9..ed407b7605 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-05-05";
+    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/master";  # FIXME: use real release
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
     cardano-playground.url = "github:input-output-hk/cardano-playground";
     cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
diff --git a/nix/internal/launcher-config.nix b/nix/internal/launcher-config.nix
index 9586c1c367..07b8b004b1 100644
--- a/nix/internal/launcher-config.nix
+++ b/nix/internal/launcher-config.nix
@@ -44,12 +44,13 @@ let
       builtins.readFile (originalFiles + "/config.json")));
 
     nodeConfig = originalNodeConfig // {
-      ConwayGenesisFile  = originalFiles + "/" + originalNodeConfig.ConwayGenesisFile;
       AlonzoGenesisFile  = originalFiles + "/" + originalNodeConfig.AlonzoGenesisFile;
       ByronGenesisFile   = originalFiles + "/" + originalNodeConfig.ByronGenesisFile;
       ShelleyGenesisFile = originalFiles + "/" + originalNodeConfig.ShelleyGenesisFile;
       minSeverity = "Info";  # XXX: Needed for sync % updates.
-    };
+    } // (if originalNodeConfig ? ConwayGenesisFile then {
+      ConwayGenesisFile  = originalFiles + "/" + originalNodeConfig.ConwayGenesisFile;
+    } else {});
   in {
     cluster = envName;
     networkName = envName;