diff --git a/api/logic/meta/BaseEntity.h b/api/logic/meta/BaseEntity.h
index 85051d979..85c25e48f 100644
--- a/api/logic/meta/BaseEntity.h
+++ b/api/logic/meta/BaseEntity.h
@@ -57,7 +57,8 @@ public:
 	}
 	bool shouldStartRemoteUpdate() const
 	{
-		return m_updateStatus == UpdateStatus::NotDone;
+		// TODO: version-locks and offline mode?
+		return m_updateStatus != UpdateStatus::InProgress;
 	}
 
 	void load();