diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index b53e97937..8fb96b097 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1043,6 +1043,7 @@ define([
                 var member = members[curve];
                 if (!member.inviteChannel) { return; }
                 if (!member.hash) { return; }
+                if (!teamData.hash) { delete member.hash; return; }
                 try {
                     member.hash = Invite.decryptHash(member.hash, teamData.hash);
                 } catch (e) { console.error(e); }
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 539c34eec..ae3809aae 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -834,14 +834,16 @@ define([
             status,
         ];
         if (data.inviteChannel) {
-            var copy = h('span.fa.fa-copy');
-            $(copy).click(function () {
-                var privateData = common.getMetadataMgr().getPrivateData();
-                var origin = privateData.origin;
-                var href = origin + Hash.hashToHref(data.hash, 'teams');
-                var success = Clipboard.copy(href);
-                if (success) { UI.log(Messages.shareSuccess); }
-            }).prependTo(actions);
+            if (data.hash) {
+                var copy = h('span.fa.fa-copy');
+                $(copy).click(function () {
+                    var privateData = common.getMetadataMgr().getPrivateData();
+                    var origin = privateData.origin;
+                    var href = origin + Hash.hashToHref(data.hash, 'teams');
+                    var success = Clipboard.copy(href);
+                    if (success) { UI.log(Messages.shareSuccess); }
+                }).prependTo(actions);
+            }
             content = [
                 avatar,
                 name,
@@ -1380,7 +1382,7 @@ define([
                     Messages._getKey('team_inviteFromMsg',
                     [Util.fixHTML(getDisplayName(json.author.displayName)),
                     Util.fixHTML(json.teamName)])));
-                if (typeof(json.message) === 'string') {
+                if (typeof(json.message) === 'string' && json.message) {
                     var message = h('div.cp-teams-invite-message');
                     json.message.split('\n').forEach(line => {
                         if (line.trim()) {