diff --git a/app/web_hub.go b/app/web_hub.go
index 0af73f39f0..0faa5fc5b2 100644
--- a/app/web_hub.go
+++ b/app/web_hub.go
@@ -27,8 +27,10 @@ const (
 )
 
 type Hub struct {
-	connections     []*WebConn
+	// connectionCount should be kept first.
+	// See https://github.com/mattermost/platform/pull/7281
 	connectionCount int64
+	connections     []*WebConn
 	connectionIndex int
 	register        chan *WebConn
 	unregister      chan *WebConn
diff --git a/store/sql_supplier.go b/store/sql_supplier.go
index 442c55ce9a..53153d9117 100644
--- a/store/sql_supplier.go
+++ b/store/sql_supplier.go
@@ -83,12 +83,14 @@ type SqlSupplierOldStores struct {
 }
 
 type SqlSupplier struct {
+	// rrCounter and srCounter should be kept first.
+	// See https://github.com/mattermost/platform/pull/7281
+	rrCounter      int64
+	srCounter      int64
 	next           LayeredStoreSupplier
 	master         *gorp.DbMap
 	replicas       []*gorp.DbMap
 	searchReplicas []*gorp.DbMap
-	rrCounter      int64
-	srCounter      int64
 	oldStores      SqlSupplierOldStores
 }