diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 858f8a37..3b0a977e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,22 @@
         android:theme="@style/TuskyTheme"
         android:usesCleartextTraffic="false">
 
+        <activity
+            android:name=".SplashActivity"
+            android:theme="@style/SplashTheme"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/share_shortcuts" />
+
+        </activity>
         <activity
             android:name=".components.login.LoginActivity"
             android:windowSoftInputMode="adjustResize">
@@ -29,13 +45,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize"
-            android:theme="@style/SplashTheme"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
 
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -83,9 +93,6 @@
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
                 android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/share_shortcuts" />
 
         </activity>
         <activity
diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 5cc8612a..5c7901c5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -35,7 +35,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.emoji.text.EmojiCompat
 import androidx.emoji.text.EmojiCompat.InitCallback
 import androidx.lifecycle.Lifecycle
@@ -160,12 +159,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        installSplashScreen()
         super.onCreate(savedInstanceState)
 
-        // delete old notification channels
-        NotificationHelper.deleteLegacyNotificationChannels(this, accountManager)
-
         val activeAccount = accountManager.activeAccount
             ?: return // will be redirected to LoginActivity by BaseActivity
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt b/app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt
new file mode 100644
index 00000000..62f95162
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt
@@ -0,0 +1,51 @@
+/* Copyright 2018 Conny Duck
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.keylesspalace.tusky.components.login.LoginActivity
+import com.keylesspalace.tusky.components.notifications.NotificationHelper
+import com.keylesspalace.tusky.db.AccountManager
+import com.keylesspalace.tusky.di.Injectable
+import javax.inject.Inject
+
+@SuppressLint("CustomSplashScreen")
+class SplashActivity : AppCompatActivity(), Injectable {
+
+    @Inject
+    lateinit var accountManager: AccountManager
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        /** delete old notification channels */
+        NotificationHelper.deleteLegacyNotificationChannels(this, accountManager)
+
+        /** Determine whether the user is currently logged in, and if so go ahead and load the
+         *  timeline. Otherwise, start the activity_login screen. */
+
+        val intent = if (accountManager.activeAccount != null) {
+            Intent(this, MainActivity::class.java)
+        } else {
+            LoginActivity.getIntent(this, false)
+        }
+        startActivity(intent)
+        finish()
+    }
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/preference/EmojiPreference.kt b/app/src/main/java/com/keylesspalace/tusky/components/preference/EmojiPreference.kt
index 2c565a71..47cb37ae 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/preference/EmojiPreference.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/preference/EmojiPreference.kt
@@ -13,8 +13,8 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.PreferenceManager
-import com.keylesspalace.tusky.MainActivity
 import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.SplashActivity
 import com.keylesspalace.tusky.components.notifications.NotificationHelper
 import com.keylesspalace.tusky.databinding.DialogEmojicompatBinding
 import com.keylesspalace.tusky.databinding.ItemEmojiPrefBinding
@@ -216,7 +216,7 @@ class EmojiPreference(
                 .setPositiveButton(R.string.restart) { _, _ ->
                     // Restart the app
                     // From https://stackoverflow.com/a/17166729/5070653
-                    val launchIntent = Intent(context, MainActivity::class.java)
+                    val launchIntent = Intent(context, SplashActivity::class.java)
                     val mPendingIntent = PendingIntent.getActivity(
                         context,
                         0x1f973, // This is the codepoint of the party face emoji :D
diff --git a/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
index b74bac79..d85f6c45 100644
--- a/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
@@ -23,6 +23,7 @@ import com.keylesspalace.tusky.FiltersActivity
 import com.keylesspalace.tusky.LicenseActivity
 import com.keylesspalace.tusky.ListsActivity
 import com.keylesspalace.tusky.MainActivity
+import com.keylesspalace.tusky.SplashActivity
 import com.keylesspalace.tusky.StatusListActivity
 import com.keylesspalace.tusky.TabPreferenceActivity
 import com.keylesspalace.tusky.ViewMediaActivity
@@ -116,4 +117,7 @@ abstract class ActivitiesModule {
 
     @ContributesAndroidInjector
     abstract fun contributesDraftActivity(): DraftsActivity
+
+    @ContributesAndroidInjector
+    abstract fun contributesSplashActivity(): SplashActivity
 }