diff --git a/server/src/network_manager.cpp b/server/src/network_manager.cpp
index ad5bc53..9fa267c 100644
--- a/server/src/network_manager.cpp
+++ b/server/src/network_manager.cpp
@@ -28,10 +28,10 @@ NetworkManager::NetworkManager(const std::string& db_path) :
 }
 
 NetworkManager::~NetworkManager(void) {
+  stop();
   for(auto& pair : _active_machines) {
     _save_machine_vfs(pair.second.machine.get());
   }
-  stop();
 }
 
 void NetworkManager::stop(void) {