diff --git a/src/XMPPJID.m b/src/XMPPJID.m
index df23d6f..ebd2170 100644
--- a/src/XMPPJID.m
+++ b/src/XMPPJID.m
@@ -131,6 +131,10 @@
 
 - (OFString*)fullJID
 {
+	/* If we don't have a resource, the full JID is equal to the bare JID */
+	if (resource == nil)
+		return [self bareJID];
+
 	if (node != nil)
 		return [OFString stringWithFormat: @"%@@%@/%@",
 		       node, domain, resource];