diff --git a/internal/p2p/peermanager.go b/internal/p2p/peermanager.go
index 4d179e63f..90a70880a 100644
--- a/internal/p2p/peermanager.go
+++ b/internal/p2p/peermanager.go
@@ -549,7 +549,7 @@ func (m *PeerManager) TryDialNext() NodeAddress {
 	}
 
 	for _, peer := range m.store.Ranked() {
-		if m.dialing[peer.ID] || m.isConnected(peer.ID) {
+		if m.dialing[peer.ID] || m.isConnected(peer.ID) || peer.ID == m.selfID {
 			continue
 		}
 
diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go
index 601c72c68..64a1f92bb 100644
--- a/test/e2e/generator/generate.go
+++ b/test/e2e/generator/generate.go
@@ -49,7 +49,7 @@ var (
 		e2e.StateSyncRPC:      45,
 	}
 	nodePersistIntervals  = uniformChoice{0, 1, 5}
-	nodeSnapshotIntervals = uniformChoice{0, 5}
+	nodeSnapshotIntervals = uniformChoice{0, 3}
 	nodeRetainBlocks      = uniformChoice{
 		0,
 		2 * int(e2e.EvidenceAgeHeight),