diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index c9d02b194a35031b40b647b6d36f5a5dae3290e2..f902812462810d651a87d7d40cad90fceee78bf4 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -2302,7 +2302,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 					# we are banned
 					self.dispatch('ERROR', (_('Unable to join group chat'),
 						_('You are banned from group chat %s.') % room_jid))
-				elif (errcode == '404') or (errcon == 'item-not-found'):
+				elif (errcode == '404') or (errcon in ('item-not-found',
+				'remote-server-not-found')):
 					if gc_control is None or gc_control.autorejoin is None:
 						# group chat does not exist
 						self.dispatch('ERROR', (_('Unable to join group chat'),