diff --git a/src/main/kotlin/com/example/onui/domain/diary/entity/Diary.kt b/src/main/kotlin/com/example/onui/domain/diary/entity/Diary.kt
index 0e7eb73..d8325e7 100644
--- a/src/main/kotlin/com/example/onui/domain/diary/entity/Diary.kt
+++ b/src/main/kotlin/com/example/onui/domain/diary/entity/Diary.kt
@@ -88,7 +88,7 @@ Diary(
 
     fun toFilteringTimelineResponse(badWordFiltering: BadWordFiltering) = TimelineResponse(
         this.id!!,
-        badWordFiltering.change(this.content),
+        this.content?.let { return@let badWordFiltering.change(it) },
         this.mood,
         this.tagList,
         this.image,
diff --git a/src/main/kotlin/com/example/onui/global/config/FCMConfig.kt b/src/main/kotlin/com/example/onui/global/config/firebase/FCMConfig.kt
similarity index 88%
rename from src/main/kotlin/com/example/onui/global/config/FCMConfig.kt
rename to src/main/kotlin/com/example/onui/global/config/firebase/FCMConfig.kt
index da3c678..1e362b8 100644
--- a/src/main/kotlin/com/example/onui/global/config/FCMConfig.kt
+++ b/src/main/kotlin/com/example/onui/global/config/firebase/FCMConfig.kt
@@ -1,4 +1,4 @@
-package com.example.onui.global.config
+package com.example.onui.global.config.firebase
 
 import com.example.onui.global.env.FCMProperty
 import com.google.auth.oauth2.GoogleCredentials
@@ -7,14 +7,9 @@ import com.google.firebase.FirebaseOptions
 import com.google.firebase.messaging.FirebaseMessaging
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.core.io.ClassPathResource
-import java.io.File
-import java.io.IOException
 import java.io.InputStream
 import java.nio.file.Files
 import java.nio.file.Paths
-import kotlin.io.path.Path
-
 
 @Configuration
 class FCMConfig(