diff --git a/src_main/io_devices/pipeer.cpp b/src_main/io_devices/pipeer.cpp
index 6f4c181a..861b270f 100755
--- a/src_main/io_devices/pipeer.cpp
+++ b/src_main/io_devices/pipeer.cpp
@@ -187,6 +187,9 @@ PIPeer::~PIPeer() {
 	//piCout << "~PIPeer" << uint(this);
 	if (destroyed) return;
 	destroyed = true;
+	sync_timer.stop();
+	diag_s.stop();
+	diag_d.stop();
 	PIMutexLocker ml(peers_mutex);
 	piForeach (PeerInfo & p, peers)
 		if (p._data) {
@@ -194,9 +197,6 @@ PIPeer::~PIPeer() {
 			p._data->dt_out.stop();
 			p._data->t.stop(true);
 		}
-	sync_timer.stop();
-	diag_s.stop();
-	diag_d.stop();
 	destroyEths();
 	piForeach (PIEthernet * i, eths_mcast) {
 		if (!i) continue;