diff --git a/src/gui.py b/src/gui.py
index 6e0d33e1..26a4a00b 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -878,6 +878,7 @@ class Gui(object):
         room = self.current_room()
         if len(args) == 0:
             self.add_message_to_room(room, _("The subject of the room is: %s") % room.topic.decode('utf-8'))
+            return
         subject = ' '.join(args)
         if not room.joined or room.name == "Info":
             return