diff --git a/app/src/main/java/net/i2p/android/preferences/GraphsPreferenceFragment.java b/app/src/main/java/net/i2p/android/preferences/GraphsPreferenceFragment.java
index 175b9c569..bf4b2f17a 100644
--- a/app/src/main/java/net/i2p/android/preferences/GraphsPreferenceFragment.java
+++ b/app/src/main/java/net/i2p/android/preferences/GraphsPreferenceFragment.java
@@ -1,8 +1,10 @@
 package net.i2p.android.preferences;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.PreferenceCategory;
+import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 
 import net.i2p.android.router.R;
@@ -19,6 +21,8 @@ import java.util.Map;
 import java.util.SortedSet;
 
 public class GraphsPreferenceFragment extends I2PreferenceFragment {
+    public static final String GRAPH_PREFERENCES_SEEN = "graphPreferencesSeen";
+
     @Override
     public void onCreate(Bundle paramBundle) {
         super.onCreate(paramBundle);
@@ -92,6 +96,13 @@ public class GraphsPreferenceFragment extends I2PreferenceFragment {
                     groupPrefs.addPreference(statPref);
                 }
             }
+
+            // The user has now seen the current (possibly default) configuration
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+            if (!prefs.getBoolean(GRAPH_PREFERENCES_SEEN, false))
+                prefs.edit()
+                        .putBoolean(GRAPH_PREFERENCES_SEEN, true)
+                        .apply();
         }
     }
 }
diff --git a/app/src/main/java/net/i2p/android/router/util/Util.java b/app/src/main/java/net/i2p/android/router/util/Util.java
index 7a31e1758..c567071ae 100644
--- a/app/src/main/java/net/i2p/android/router/util/Util.java
+++ b/app/src/main/java/net/i2p/android/router/util/Util.java
@@ -8,6 +8,7 @@ import android.content.res.Resources;
 import android.preference.PreferenceManager;
 
 import net.i2p.I2PAppContext;
+import net.i2p.android.preferences.GraphsPreferenceFragment;
 import net.i2p.android.router.I2PConstants;
 import net.i2p.android.router.service.State;
 import net.i2p.data.DataHelper;
@@ -172,7 +173,11 @@ public abstract class Util implements I2PConstants {
             }
         }
         if (statSummaries.isEmpty()) {
-            routerProps.setProperty("stat.summaries", "");
+            // If the graph preferences have not yet been seen, they should be the default
+            if (preferences.getBoolean(GraphsPreferenceFragment.GRAPH_PREFERENCES_SEEN, false))
+                routerProps.setProperty("stat.summaries", "");
+            else
+                toRemove.setProperty("stat.summaries", "");
         } else {
             Iterator<String> iter = statSummaries.iterator();
             StringBuilder buf = new StringBuilder(iter.next());