diff --git a/src/client/ui/templates/party/party.js b/src/client/ui/templates/party/party.js
index 69afe7f3..475c7429 100644
--- a/src/client/ui/templates/party/party.js
+++ b/src/client/ui/templates/party/party.js
@@ -100,6 +100,10 @@ define([
 		},
 
 		onGetParty: function(party) {
+			// Destroy invite frame if you join a party
+			if (this.invite)
+				this.destroyInvite();
+
 			var container = this.find('.party .list')
 				.empty();
 
diff --git a/src/server/components/social.js b/src/server/components/social.js
index d7b5c2fc..70cfa89e 100644
--- a/src/server/components/social.js
+++ b/src/server/components/social.js
@@ -181,7 +181,10 @@ define([
 				this.updatePartyOnThread();
 			}
 
-			this.party.push(sourceId);
+			// Only add if not yet in party
+			if (!this.party.find(id => (id === sourceId)))
+				this.party.push(sourceId);
+
 			this.updatePartyOnThread();
 
 			this.party.forEach(function(p) {