diff --git a/CHANGELOG.md b/CHANGELOG.md
index db48e6752ea1a2eddbedc966f28af0ee4fa43bea..7921f263f8bfa23de227bf8bb08649d9dbf9a0a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [keep a changelog](http://keepachangelog.com/) and this p
 - Allow group batch fetch by both ID and name.
 - Increase heartbeat server time precision.
 - Rework the embedded dashboard.
+- Allow up to 64 characters for device ID linking.
 
 ### Fixed
 - Fix Facebook unlink operation.
diff --git a/server/pipeline_link_unlink.go b/server/pipeline_link_unlink.go
index 7058e26d6c823faf40218385fec9820e12ee2934..3c6f6993e8224f9e31b232b2833d4a80867f637d 100644
--- a/server/pipeline_link_unlink.go
+++ b/server/pipeline_link_unlink.go
@@ -54,8 +54,8 @@ func (p *pipeline) linkDevice(logger zap.Logger, session *session, envelope *Env
 	} else if invalidCharsRegex.MatchString(deviceID) {
 		session.Send(ErrorMessageBadInput(envelope.CollationId, "Invalid device ID, no spaces or control characters allowed"))
 		return
-	} else if len(deviceID) < 10 || len(deviceID) > 36 {
-		session.Send(ErrorMessageBadInput(envelope.CollationId, "Invalid device ID, must be 10-36 bytes"))
+	} else if len(deviceID) < 10 || len(deviceID) > 64 {
+		session.Send(ErrorMessageBadInput(envelope.CollationId, "Invalid device ID, must be 10-64 bytes"))
 		return
 	}