diff --git a/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java b/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java
index da912c7e218..37aa4b4ab4c 100644
--- a/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java
+++ b/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java
@@ -196,6 +196,8 @@ public static class OSMDownloadSourcePanel extends AbstractDownloadSourcePanel<L
         /** This is used to keep track of the components for download sources, and to dynamically update/remove them */
         private final JPanel downloadSourcesPanel;
 
+        private boolean inRestore = false;
+
         private final ChangeListener checkboxChangeListener;
 
         /**
@@ -255,13 +257,16 @@ public List<IDownloadSourceType> getData() {
 
         @Override
         public void rememberSettings() {
-            DOWNLOAD_SOURCES.forEach(type -> type.getBooleanProperty().put(type.getCheckBox().isSelected()));
+            if (!inRestore)
+                DOWNLOAD_SOURCES.forEach(type -> type.getBooleanProperty().put(type.getCheckBox().isSelected()));
         }
 
         @Override
         public void restoreSettings() {
+            inRestore = true;
             updateSources();
             DOWNLOAD_SOURCES.forEach(type -> type.getCheckBox().setSelected(type.isEnabled()));
+            inRestore = false;
         }
 
         @Override