diff --git a/gajim/gtk/groupchat_info.py b/gajim/gtk/groupchat_info.py
index 68a1d1facb62474cd91c6a3c120e48a9fede1485..19995975ac53e18d222c5e3636a9ffcdd055a6ea 100644
--- a/gajim/gtk/groupchat_info.py
+++ b/gajim/gtk/groupchat_info.py
@@ -191,9 +191,6 @@ def set_from_disco_info(self, info: DiscoInfo) -> None:
         if self._minimal:
             return
 
-        # Set subject
-        self.set_subject(info.muc_subject)
-
         # Set user
         has_users = info.muc_users is not None
         self._ui.users.set_text(info.muc_users or '')
diff --git a/test/gtk/groupchat_info.py b/test/gtk/groupchat_info.py
index 5d79ac59d4239ed772475a6c6b38a33571de7312..d778a029452664a54cb1498254c282e84fbe42bc 100644
--- a/test/gtk/groupchat_info.py
+++ b/test/gtk/groupchat_info.py
@@ -6,6 +6,7 @@
 
 from nbxmpp.protocol import Iq
 from nbxmpp.modules.discovery import parse_disco_info
+from nbxmpp.structs import MucSubject
 
 from gajim.common.const import CSSPriority
 
@@ -86,6 +87,10 @@
 </query>
 </iq>''')
 
+
+subject = ('Lorem ipsum dolor sit amet, consetetur sadipscing elitr sed '
+           'diam nonumy eirmod tempor invidunt ut labore et dolore magna')
+
 disco_info = parse_disco_info(stanza)
 
 class GroupchatInfo(Gtk.ApplicationWindow):
@@ -107,10 +112,9 @@ def __init__(self):
 
         self.add(self._main_box)
         self._muc_info_box.set_from_disco_info(disco_info)
-        self._muc_info_box.set_subject(
-            'Lorem ipsum dolor sit amet, consetetur sadipscing elitr sed '
-            'diam nonumy eirmod tempor invidunt ut labore et dolore magna')
-        self._muc_info_box.set_author('userX', None)
+        self._muc_info_box.set_subject(MucSubject(text=subject,
+                                                  author='someone',
+                                                  timestamp=None))
         self.show_all()