diff --git a/changelog/unreleased/5012 b/changelog/unreleased/5012
new file mode 100644
index 00000000000..f29c8b2125e
--- /dev/null
+++ b/changelog/unreleased/5012
@@ -0,0 +1,6 @@
+Bugfix: Guard bottom navigation against crash when no account is set
+
+A null-account check has been added to the bottom navigation so it skips navigation instead of crashing.
+
+https://github.com/owncloud/android/issues/4998
+https://github.com/owncloud/android/pull/5012
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
index fa1dd9807eb..153def4368f 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.kt
@@ -242,6 +242,9 @@ abstract class DrawerActivity : ToolbarActivity() {
     }
 
     private fun bottomBarNavigationTo(menuItemId: Int, isCurrentOptionActive: Boolean) {
+        if (account == null) {
+            return
+        }
         when (menuItemId) {
             R.id.nav_all_files -> navigateToOption(FileListOption.ALL_FILES)
             R.id.nav_spaces -> navigateToOption(FileListOption.SPACES_LIST)