diff --git a/manifest_xml.py b/manifest_xml.py
index 9189eec..c9e5c40 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -228,7 +228,11 @@
   @property
   def manifest_server(self):
     self._Load()
-    return self._manifest_server
+
+    if self._manifest_server:
+      return self._manifest_server
+
+    return self.manifestProject.config.GetString('repo.manifest-server')
 
   @property
   def IsMirror(self):