diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 8a1927a39ca..6d790d4df98 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -3,3 +3,5 @@
 ### SDK Enhancements
 
 ### SDK Bugs
+* Fix misaligned struct member used in atomic operation.
+  * This change fixes panics on 32-bit systems in services that use endpoint discovery.
diff --git a/aws/crr/cache.go b/aws/crr/cache.go
index c07f6731ea7..eeb3bc0c5a0 100644
--- a/aws/crr/cache.go
+++ b/aws/crr/cache.go
@@ -8,12 +8,12 @@ import (
 // based on some key. The datastructure makes use of a read write
 // mutex to enable asynchronous use.
 type EndpointCache struct {
-	endpoints     syncMap
-	endpointLimit int64
 	// size is used to count the number elements in the cache.
 	// The atomic package is used to ensure this size is accurate when
 	// using multiple goroutines.
-	size int64
+	size          int64
+	endpoints     syncMap
+	endpointLimit int64
 }
 
 // NewEndpointCache will return a newly initialized cache with a limit