diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26dc0f4..a6bd1cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project follows [semantic versioning](http://semver.org).
 - [changed] Updated dependencies
 - [changed] New measurements
 - [fixed] Fixed wrong hex address formatting
+- [fixed] Fixed peer exchange for more than 65000 peers
 
 ### v0.4.3 (2016-02-02)
 
diff --git a/src/cloud.rs b/src/cloud.rs
index 762fae9..98f5d08 100644
--- a/src/cloud.rs
+++ b/src/cloud.rs
@@ -206,6 +206,9 @@ impl<P: Protocol> GenericCloud<P> {
                 if peer_num < 10 {
                     peer_num = 10;
                 }
+                if peer_num > 255 {
+                    peer_num = 255
+                }
             }
             let peers = self.peers.subset(peer_num);
             let mut msg = Message::Peers(peers);