diff --git a/app/src/main/java/org/futo/circles/MainActivity.kt b/app/src/main/java/org/futo/circles/MainActivity.kt
index 86dcb1e8ee34b8b9b8af6dab0aab508d0e62bf46..b8e2886817653f3658238d13fc5b99ec6fa2dbc1 100644
--- a/app/src/main/java/org/futo/circles/MainActivity.kt
+++ b/app/src/main/java/org/futo/circles/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import dagger.hilt.android.AndroidEntryPoint
 import org.futo.circles.core.base.BaseActivity
+import org.futo.circles.core.feature.markdown.MarkdownParser
 import org.futo.circles.core.utils.LauncherActivityUtils
 import org.futo.circles.feature.home.DeepLinkIntentHandler
 
@@ -15,6 +16,12 @@ class MainActivity : BaseActivity(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         LauncherActivityUtils.setInvalidTokenListener(this, getSelfIntent(this))
+        MarkdownParser.initBuilder(this)
+    }
+
+    override fun onDestroy() {
+        MarkdownParser.clearInstance()
+        super.onDestroy()
     }
 
     override fun onNewIntent(intent: Intent) {
diff --git a/app/src/main/java/org/futo/circles/feature/timeline/TimelineDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/timeline/TimelineDialogFragment.kt
index bf526aeeff6c7201ac88b40f14dee919a0ddd514..a0d477898c688f2cfe0accdf81ba53051a59dead 100644
--- a/app/src/main/java/org/futo/circles/feature/timeline/TimelineDialogFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/timeline/TimelineDialogFragment.kt
@@ -89,17 +89,11 @@ class TimelineDialogFragment : BaseFullscreenDialogFragment(DialogFragmentTimeli
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        MarkdownParser.initBuilder(requireContext())
         setupViews()
         setupObservers()
         setupMenu()
     }
 
-    override fun onDestroy() {
-        MarkdownParser.clearInstance()
-        super.onDestroy()
-    }
-
     private fun setupViews() {
         binding.rvTimeline.apply {
             adapter = listAdapter