diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc
index 15d142e3d8f6e6..5113c9ce143125 100644
--- a/src/node_webstorage.cc
+++ b/src/node_webstorage.cc
@@ -572,9 +572,7 @@ static Intercepted StorageSetter(Local<Name> property,
   Storage* storage;
   ASSIGN_OR_RETURN_UNWRAP(&storage, info.This(), Intercepted::kNo);
 
-  if (storage->Store(property, value)) {
-    info.GetReturnValue().Set(value);
-  }
+  storage->Store(property, value);
 
   return Intercepted::kYes;
 }
diff --git a/unofficial.gni b/unofficial.gni
index 3ff9815357dd36..fda16835b12182 100644
--- a/unofficial.gni
+++ b/unofficial.gni
@@ -212,6 +212,7 @@ template("node_gn_build") {
     ]
     if (node_use_node_snapshot) {
       sources += [ "$target_gen_dir/node_snapshot.cc" ]
+      configs += [ ":node_internal_config" ]
       deps += [ ":run_node_mksnapshot" ]
       if (is_clang || !is_win) {
         cflags_cc = [