diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
index ac1dd5e..e581dd1 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
@@ -191,13 +191,13 @@ class AudioContentCommentQueryRepositoryImpl(
     ): List<FindPushTokenByContentIdAndCommentParentIdMyMemberIdResponse> {
         var where = audioContent.id.eq(contentId)
             .and(member.id.ne(myMemberId))
-            .and(audioContentComment.isActive.isTrue)
 
         if (commentParentId != null) {
             where = where.and(
                 audioContentComment.parent.id.eq(commentParentId)
                     .or(audioContentComment.id.eq(commentParentId))
             )
+                .and(audioContentComment.isActive.isTrue)
         }
 
         val response = if (commentParentId != null) {
@@ -221,9 +221,8 @@ class AudioContentCommentQueryRepositoryImpl(
                         member.container
                     )
                 )
-                .from(audioContentComment)
-                .innerJoin(audioContentComment.audioContent, audioContent)
-                .innerJoin(audioContentComment.member, member)
+                .from(audioContent)
+                .innerJoin(audioContent.member, member)
                 .where(where)
                 .fetch()
         }