diff --git a/core/bot.py b/core/bot.py
index 90b5baf..90bf653 100644
--- a/core/bot.py
+++ b/core/bot.py
@@ -183,9 +183,12 @@ class IRCBot(IRCClient):
                     increment = 0.7
                 increment += 0.1
             else:
-                error("%s - %i - Cannot join channel we are already on - %s" % (self.net, self.num, i))
+                error("%s - Cannot join channel we are already on: %s - %i" % (i, self.net, self.num))
 
     def checkChannels(self):
+        if not chankeep.allRelaysActive(self.net):
+            debug("Skipping channel check as we have inactive relays: %s - %i" % (self.net, self.num))
+            return
         if self.net in main.TempChan.keys():
             if self.num in main.TempChan[self.net].keys():
                 self.joinChannels(main.TempChan[self.net][self.num])
diff --git a/modules/chankeep.py b/modules/chankeep.py
index 83edcef..9c9aac3 100644
--- a/modules/chankeep.py
+++ b/modules/chankeep.py
@@ -12,7 +12,7 @@ def allRelaysActive(net):
     for i in main.network[net].relays.keys():
         name = net+str(i)
         if name in main.IRCPool.keys():
-            if main.IRCPool[name].isconnected:
+            if main.IRCPool[name].isconnected and main.network[net].relays[i]["registered"]:
                 existNum += 1
     if existNum == relayNum:
         return True