diff --git a/server/startup/indexes.coffee b/server/startup/indexes.coffee
index eeec7a23461..bae065df2d5 100644
--- a/server/startup/indexes.coffee
+++ b/server/startup/indexes.coffee
@@ -3,6 +3,6 @@ Meteor.startup ->
 		ChatMessage._ensureIndex({ 'expireAt': 1 }, { expireAfterSeconds: 0 })
 		ChatMessage._ensureIndex({ 'rid': 1 })
 		ChatMessage._ensureIndex({ 'rid': 1, 'ts': 1 })
-		ChatSubscription._ensureIndex({ 'uid': 1 })
+		ChatSubscription._ensureIndex({ 'u._id': 1 })
 		ChatSubscription._ensureIndex({ 'ts': 1 })
-		ChatSubscription._ensureIndex({ 'rid': 1, 'uid': 1 }, {unique: true})
+		ChatSubscription._ensureIndex({ 'rid': 1, 'u._id': 1 }, {unique: true})