diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py
index b21ce625..113275cc 100644
--- a/src/Site/SiteManager.py
+++ b/src/Site/SiteManager.py
@@ -172,4 +172,8 @@ class SiteManager(object):
 
 site_manager = SiteManager()  # Singletone
 
-peer_blacklist = [("127.0.0.1", config.fileserver_port)]  # Dont add this peers
+if config.action == "main":  # Don't connect / add myself to peerlist
+    peer_blacklist = [("127.0.0.1", config.fileserver_port)]
+else:
+    peer_blacklist = []
+