diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a5a09d0..906ad53d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,11 +76,6 @@
         <activity
             android:name=".activity.LoginActivity"
             android:screenOrientation="portrait">
-            <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.VIEW" />
 
@@ -92,6 +87,17 @@
             </intent-filter>
         </activity>
 
+
+        <activity
+            android:name=".activity.SplashActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <service android:name=".InstiAppFirebaseMessagingService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
diff --git a/app/src/main/java/app/insti/activity/SplashActivity.java b/app/src/main/java/app/insti/activity/SplashActivity.java
new file mode 100644
index 00000000..575bd568
--- /dev/null
+++ b/app/src/main/java/app/insti/activity/SplashActivity.java
@@ -0,0 +1,28 @@
+package app.insti.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import app.insti.SessionManager;
+
+public class SplashActivity extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        SessionManager session = new SessionManager(this);
+        Intent intent;
+
+        /* Skip inflating login activity if logged in */
+        if (session.isLoggedIn()) {
+            intent = new Intent(this, MainActivity.class);
+        } else {
+            intent = new Intent(this, LoginActivity.class);
+        }
+
+        startActivity(intent);
+        finish();
+    }
+}
diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml
new file mode 100644
index 00000000..75b9a5fc
--- /dev/null
+++ b/app/src/main/res/drawable/splash.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/colorWhite" />
+
+    <item
+        android:width="400dp"
+        android:height="800dp"
+        android:gravity="center">
+
+        <bitmap
+            android:src="@drawable/splash_bg"
+            android:gravity="fill_horizontal|fill_vertical" />
+    </item>
+
+</layer-list>
diff --git a/app/src/main/res/drawable/splash_bg.png b/app/src/main/res/drawable/splash_bg.png
new file mode 100644
index 00000000..37617cc8
Binary files /dev/null and b/app/src/main/res/drawable/splash_bg.png differ
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d5c5561e..23f9b960 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -92,4 +92,8 @@
     <style name="UserTabsTextAppearance" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">12sp</item>
     </style>
+
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@drawable/splash</item>
+    </style>
 </resources>