diff --git a/server/handlers/admin.go b/server/handlers/admin.go
index 88ae371..006bcf1 100644
--- a/server/handlers/admin.go
+++ b/server/handlers/admin.go
@@ -283,7 +283,9 @@ func AdminGetRoomMembers(ctx *gin.Context) {
 		}
 	}
 	scopes = append(scopes, func(db *gorm.DB) *gorm.DB {
-		return db.InnerJoins("JOIN room_members ON users.id = room_members.user_id AND room_members.room_id = ?", room.ID)
+		return db.
+			InnerJoins("JOIN room_members ON users.id = room_members.user_id").
+			Where("room_members.room_id = ?", room.ID)
 	}, db.PreloadRoomMembers())
 
 	total, err := db.GetAllUserCount(scopes...)
diff --git a/server/handlers/member.go b/server/handlers/member.go
index c055422..c018e2c 100644
--- a/server/handlers/member.go
+++ b/server/handlers/member.go
@@ -80,7 +80,9 @@ func RoomMembers(ctx *gin.Context) {
 		}
 	}
 	scopes = append(scopes, func(db *gorm.DB) *gorm.DB {
-		return db.InnerJoins("JOIN room_members ON users.id = room_members.user_id AND room_members.room_id = ?", room.ID)
+		return db.
+			InnerJoins("JOIN room_members ON users.id = room_members.user_id").
+			Where("room_members.room_id = ?", room.ID)
 	}, db.PreloadRoomMembers())
 
 	total, err := db.GetAllUserCount(scopes...)
@@ -179,7 +181,9 @@ func RoomAdminMembers(ctx *gin.Context) {
 		}
 	}
 	scopes = append(scopes, func(db *gorm.DB) *gorm.DB {
-		return db.InnerJoins("JOIN room_members ON users.id = room_members.user_id AND room_members.room_id = ?", room.ID)
+		return db.
+			InnerJoins("JOIN room_members ON users.id = room_members.user_id").
+			Where("room_members.room_id = ?", room.ID)
 	}, db.PreloadRoomMembers())
 
 	total, err := db.GetAllUserCount(scopes...)