diff --git a/addons/mail/controllers/discuss.py b/addons/mail/controllers/discuss.py
index 03b794aeac0..8c46a700839 100644
--- a/addons/mail/controllers/discuss.py
+++ b/addons/mail/controllers/discuss.py
@@ -56,6 +56,7 @@ class DiscussController(http.Controller):
                 channel_sudo = channel_sudo.create({
                     'channel_type': 'channel',
                     'default_display_mode': default_display_mode,
+                    'group_public_id': None,
                     'name': channel_name or create_token,
                     'uuid': create_token,
                 })
diff --git a/addons/mail/tests/test_mail_channel_as_guest.py b/addons/mail/tests/test_mail_channel_as_guest.py
index bc4c72acdee..bb4e3ccd077 100644
--- a/addons/mail/tests/test_mail_channel_as_guest.py
+++ b/addons/mail/tests/test_mail_channel_as_guest.py
@@ -77,3 +77,9 @@ class TestMailPublicPage(HttpCase):
 
     def test_mail_group_public_page_as_portal(self):
         self._open_group_page_as_user('portal')
+
+    def test_chat_from_token_as_guest(self):
+        self.env['ir.config_parameter'].set_param('mail.chat_from_token', True)
+        self.url_open('/chat/xyz')
+        channel = self.env['mail.channel'].search([('uuid', '=', 'xyz')])
+        self.assertEqual(len(channel), 1)