diff --git a/src/Config.py b/src/Config.py
index c71f3369..5910757b 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.7"
-        self.rev = 2166
+        self.rev = 2167
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"
diff --git a/src/Site/Site.py b/src/Site/Site.py
index 20dfe3fe..10997b04 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -265,6 +265,10 @@ class Site(object):
     # Download all files of the site
     @util.Noparallel(blocking=False)
     def download(self, check_size=False, blind_includes=False):
+        if not self.connection_server:
+            self.log.debug("No connection server found, skipping download")
+            return False
+
         self.log.debug(
             "Start downloading, bad_files: %s, check_size: %s, blind_includes: %s" %
             (self.bad_files, check_size, blind_includes)