diff --git a/core/server/server.go b/core/server/server.go
index c2a6be0..206bf3b 100644
--- a/core/server/server.go
+++ b/core/server/server.go
@@ -38,6 +38,14 @@ type server struct {
 func (s *server) Exit(ctx context.Context, in *gen.EmptyReq) (out *gen.EmptyResp, _ error) {
 	out = &gen.EmptyResp{}
 
+	if needUnsetDNS {
+		needUnsetDNS = false
+		err := sys.SetSystemDNS("Empty", boxInstance.Network().InterfaceMonitor())
+		if err != nil {
+			log.Println("Failed to unset system DNS:", err)
+		}
+	}
+
 	// Connection closed
 	defer os.Exit(0)
 	return
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 5a1680c..a020b65 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -787,9 +787,6 @@ void MainWindow::prepare_exit()
     on_commitDataRequest();
     //
     NekoGui::dataStore->save_control_no_save = true; // don't change datastore after this line
-    neko_stop(false, true);
-    //
-    sem_stopped.acquire();
     NekoGui_rpc::defaultClient->Exit();
     mu_exit.unlock();
     qDebug() << "prepare exit done!";