diff --git a/src/nxemu-os/core/core.cpp b/src/nxemu-os/core/core.cpp
index 9ed96462..497b589c 100644
--- a/src/nxemu-os/core/core.cpp
+++ b/src/nxemu-os/core/core.cpp
@@ -308,6 +308,9 @@ struct System::Impl {
     /// Services
     std::unique_ptr<Service::Services> services;
 
+    /// Network instance
+    Network::NetworkInstance network_instance;
+
     std::unique_ptr<Core::PerfStats> perf_stats;
     Core::SpeedLimiter speed_limiter;
 
diff --git a/src/nxemu-os/core/internal_network/network.cpp b/src/nxemu-os/core/internal_network/network.cpp
index ad9595b6..1b74b7c0 100644
--- a/src/nxemu-os/core/internal_network/network.cpp
+++ b/src/nxemu-os/core/internal_network/network.cpp
@@ -188,9 +188,11 @@ void Initialize() {
 void Finalize() {
     if (interrupt_pipe_fd[0] >= 0) {
         close(interrupt_pipe_fd[0]);
+        interrupt_pipe_fd[0] = -1;
     }
     if (interrupt_pipe_fd[1] >= 0) {
         close(interrupt_pipe_fd[1]);
+        interrupt_pipe_fd[1] = -1;
     }
 }