diff --git a/iface/iface_test.go b/iface/iface_test.go
index 0c7aa3f3d..8521e2f17 100644
--- a/iface/iface_test.go
+++ b/iface/iface_test.go
@@ -89,7 +89,6 @@ func getIfaceAddrs(ifaceName string) ([]net.Addr, error) {
 	return addrs, nil
 }
 
-//
 func Test_CreateInterface(t *testing.T) {
 	ifaceName := fmt.Sprintf("utun%d", WgIntNumber+1)
 	wgIP := "10.99.99.1/32"
@@ -369,8 +368,8 @@ func Test_ConnectPeers(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	timeout := 10 * time.Second
+	// todo: investigate why in some tests execution we need 30s
+	timeout := 30 * time.Second
 	timeoutChannel := time.After(timeout)
 	for {
 		select {
diff --git a/management/server/metrics/selfhosted.go b/management/server/metrics/selfhosted.go
index 40be956c4..8302f099d 100644
--- a/management/server/metrics/selfhosted.go
+++ b/management/server/metrics/selfhosted.go
@@ -188,13 +188,17 @@ func (w *Worker) generateProperties() properties {
 				userPeers++
 			}
 
-			_, connected := connections[peer.Key]
-			if connected || peer.Status.LastSeen.After(w.lastRun) {
-				activePeersLastDay++
-			}
 			osKey := strings.ToLower(fmt.Sprintf("peer_os_%s", peer.Meta.GoOS))
 			osCount := osPeers[osKey]
 			osPeers[osKey] = osCount + 1
+
+			_, connected := connections[peer.Key]
+			if connected || peer.Status.LastSeen.After(w.lastRun) {
+				activePeersLastDay++
+				osActiveKey := osKey + "_active"
+				osActiveCount := osPeers[osActiveKey]
+				osPeers[osActiveKey] = osActiveCount + 1
+			}
 		}
 	}
 
@@ -279,5 +283,4 @@ func createPostRequest(ctx context.Context, endpoint string, payloadStr string)
 	req.Header.Add("content-type", "application/json")
 
 	return req, nil
-
 }