Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java	(revision 32718)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java	(revision 32719)
@@ -146,5 +146,9 @@
     }
 
-    static void updateWIWOSMStatus(String wikipediaLang, Collection<WikipediaEntry> entries) {
+    static void updateWIWOSMStatus(String wikipediaLang, List<WikipediaEntry> entries) {
+        if (entries.size() > 20) {
+            partitionList(entries, 20).forEach(chunk -> updateWIWOSMStatus(wikipediaLang, chunk));
+            return;
+        }
         Map<String, Boolean> status = new HashMap<>();
         if (!entries.isEmpty()) {
Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 32718)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 32719)
@@ -35,5 +35,4 @@
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.SideButton;
@@ -168,6 +167,4 @@
     abstract class UpdateWikipediaArticlesSwingWorker extends SwingWorker<Void, WikipediaEntry> {
 
-        private final IntegerProperty wikipediaStatusUpdateChunkSize = new IntegerProperty("wikipedia.statusupdate.chunk-size", 20);
-
         abstract List<WikipediaEntry> getEntries();
 
@@ -177,6 +174,6 @@
             Collections.sort(entries);
             publish(entries.toArray(new WikipediaEntry[entries.size()]));
-            for (List<WikipediaEntry> chunk : WikipediaApp.partitionList(entries, wikipediaStatusUpdateChunkSize.get())) {
-                WikipediaApp.updateWIWOSMStatus(chunk.get(0).wikipediaLang, chunk);
+            if (!entries.isEmpty()) {
+                WikipediaApp.updateWIWOSMStatus(entries.get(0).wikipediaLang, entries);
             }
             return null;