diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java
index 491a98b8..e1092521 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java
@@ -13,13 +13,14 @@ import com.nutomic.syncthingandroid.service.Constants;
  */
 public class ThemedAppCompatActivity extends AppCompatActivity {
 
-    private static final String LIGHT_THEME = "1";
+    private static final String FOLLOW_SYSTEM = "-1";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // Load theme.
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        Integer prefAppTheme = Integer.parseInt(prefs.getString(Constants.PREF_APP_THEME, LIGHT_THEME));
+        //For api level below 28, Follow system fall backs to light mode
+        Integer prefAppTheme = Integer.parseInt(prefs.getString(Constants.PREF_APP_THEME, FOLLOW_SYSTEM));
         AppCompatDelegate.setDefaultNightMode(prefAppTheme);
         super.onCreate(savedInstanceState);
     }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index b244e309..18e6fb4a 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -16,11 +16,13 @@
     </string-array>
 
     <string-array name="theme_names">
+        <item>@string/preference_theme_follow_system</item>
         <item>@string/preference_theme_option_light</item>
         <item>@string/preference_theme_option_dark</item>
     </string-array>
 
     <string-array name="theme_values">
+        <item>-1</item>
         <item>1</item>
         <item>2</item>
     </string-array>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18ea1f56..d9350c33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -380,6 +380,7 @@ Please report any problems you encounter via Github.</string>
     <string name="start_into_web_gui_summary">When starting the app, open web GUI instead of the main screen</string>
 
     <string name="preference_theme_title">Theme</string>
+    <string name="preference_theme_follow_system">Follow system</string>
     <string name="preference_theme_option_light">Light</string>
     <string name="preference_theme_option_dark">Dark</string>
 
diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml
index 67d26f0b..f918738e 100644
--- a/app/src/main/res/xml/app_settings.xml
+++ b/app/src/main/res/xml/app_settings.xml
@@ -6,7 +6,7 @@
         android:title="@string/preference_theme_title"
         android:entries="@array/theme_names"
         android:entryValues="@array/theme_values"
-        android:defaultValue="1"/> <!-- 1 is Light Theme -->
+        android:defaultValue="-1"/> <!-- -1 is Follow System -->
 
     <PreferenceScreen
         android:title="@string/category_run_conditions"