diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1479b77a..d7de34f59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,12 @@ mongodb:
 8. master ブランチに戻す
 9. enjoy
 
+11.17.1 (2019/05/20)
+--------------------
+### 🐛Fixes
+* トークの通知インジケーターが点灯し続ける問題を修正
+* ユーザーグループの読み込みでエラーになることがある問題を修正
+
 11.17.0 (2019/05/19)
 --------------------
 ### 注意
diff --git a/package.json b/package.json
index ff25d7756..4d3b59388 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.17.0",
+	"version": "11.17.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts
index c1e79cd13..ffd58c714 100644
--- a/src/server/api/endpoints/messaging/messages.ts
+++ b/src/server/api/endpoints/messaging/messages.ts
@@ -114,7 +114,7 @@ export default define(meta, async (ps, user) => {
 
 		// Mark all as read
 		if (ps.markAsRead) {
-			readUserMessagingMessage(user.id, recipient.id, messages.map(x => x.id));
+			readUserMessagingMessage(user.id, recipient.id, messages.filter(m => m.recipientId === user.id).map(x => x.id));
 		}
 
 		return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, {
diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts
index 853a2510d..97d168e52 100644
--- a/src/server/api/endpoints/users/groups/joined.ts
+++ b/src/server/api/endpoints/users/groups/joined.ts
@@ -32,7 +32,9 @@ export default define(meta, async (ps, me) => {
 
 	const joinings = await UserGroupJoinings.find({
 		userId: me.id,
-		userGroupId: Not(In(ownedGroups.map(x => x.id)))
+		...(ownedGroups.length > 0 ? {
+			userGroupId: Not(In(ownedGroups.map(x => x.id)))
+		} : {})
 	});
 
 	return await Promise.all(joinings.map(x => UserGroups.pack(x.userGroupId)));