diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
index b1dc8427d..348084f66 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@@ -96,6 +96,9 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener {
             }
         }
         navController.addOnDestinationChangedListener { _, destination, _ ->
+            if (destination.id == navGraph.startDestinationId) {
+                currentFragment(R.id.fragment_container)?.enterTransition = null
+            }
             when (destination.id) {
                 R.id.action_home, R.id.action_song, R.id.action_album, R.id.action_artist, R.id.action_folder, R.id.action_playlist, R.id.action_genre -> {
                     // Save the last tab
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt
index 24fc4dd3d..07ce4d3a0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt
@@ -67,7 +67,7 @@ fun AppCompatActivity.currentFragment(navHostId: Int): Fragment? {
     val navHostFragment: NavHostFragment =
         supportFragmentManager.findFragmentById(navHostId) as NavHostFragment
     navHostFragment.targetFragment
-    return navHostFragment.childFragmentManager.fragments.first()
+    return navHostFragment.childFragmentManager.fragments.firstOrNull()
 }
 
 @Suppress("UNCHECKED_CAST")