diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/QuestAutoSyncer.java b/app/src/main/java/de/westnordost/streetcomplete/data/QuestAutoSyncer.java
index 9f01e1ca3a7..166edda9a35 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/data/QuestAutoSyncer.java
+++ b/app/src/main/java/de/westnordost/streetcomplete/data/QuestAutoSyncer.java
@@ -131,13 +131,6 @@ public void triggerAutoUpload()
 		if(!isAllowedByPreference()) return;
 		if(!isConnected) return;
 		questController.upload();
-		triggerDelayedClosingOfChangesets();
-	}
-
-	private void triggerDelayedClosingOfChangesets()
-	{
-		ChangesetAutoCloserJob.scheduleJob();
-
 	}
 
 	private boolean updateConnectionState()
diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/upload/AOsmQuestChangesUpload.java b/app/src/main/java/de/westnordost/streetcomplete/data/osm/upload/AOsmQuestChangesUpload.java
index 3a78ffed404..67182e21f2f 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/data/osm/upload/AOsmQuestChangesUpload.java
+++ b/app/src/main/java/de/westnordost/streetcomplete/data/osm/upload/AOsmQuestChangesUpload.java
@@ -132,6 +132,12 @@ public synchronized void upload(AtomicBoolean cancelState)
 		}
 
 		closeOpenChangesets();
+
+		if(commits > 0)
+		{
+			// changesets are closed delayed after X minutes of inactivity
+			ChangesetAutoCloserJob.scheduleJob();
+		}
 	}
 
 	private void cleanUp()