diff --git a/mumbleBot.py b/mumbleBot.py
index e669f71..f72ae6d 100644
--- a/mumbleBot.py
+++ b/mumbleBot.py
@@ -387,31 +387,37 @@ class MumbleBot:
                             genre = s['genre']
                             # msg += f'<tr><td>{stationid}</td><td>{stationname}</td><td>{genre}</td><td>{codec}/{bitrate}</td><td>{country}</td></tr>'
                             msg += '<tr><td>%s</td><td>%s</td><td>%s</td><td>%s/%s</td><td>%s</td></tr>' % (stationid, stationname, genre, codec, bitrate, country)
-                        msg += '</table>'
-                        # Shorten table if message too long
-                        if len(msg) <= 5000:
-                            logging.debug('Result too long stage I')
-                            msg = var.config.get('strings', 'rbqueryresult') + " :" + ' (shortened L1)'
-                            msg += '\n<table><tr><th>!rbplay ID</th><th>Station Name</th></tr>'
-                            for s in rb_stations:
-                                stationid = s['id']
-                                stationname = s['stationname']
-                                # msg += f'<tr><td>{stationid}</td><td>{stationname}</td>'
-                                msg += '<tr><td>%s</td><td>%s</td>' % (stationid, stationname)
+                            msg += '</table>'
+                            # Full message as html table
+                            if len(msg) <= 5000:
                                 self.send_msg(msg, text)
-                        else:
-                            logging.debug('Result too long stage II')
-                            msg = var.config.get('strings', 'rbqueryresult') + " :" + ' (shortened L2)'
-                            msg += '!rbplay ID - Station Name'
-                            for s in rb_stations:
-                                stationid = s['id']
-                                stationname = s['stationname'][:12]
-                                # msg += f'{stationid} - {stationname}'
-                                msg += '%s - %s' % (stationid, stationname)
-                                if len(msg) <= 5000:
-                                    self.send_msg(msg, text)
-                                else:
-                                    self.send_msg('Query result too long to post (> 5000 characters), please try another query.', text)
+                            # Shorten message if message too long (stage I)
+                            else:
+                                logging.debug('Result too long stage I')
+                                msg = var.config.get('strings', 'rbqueryresult') + " :" + ' (shortened L1)'
+                                msg += '\n<table><tr><th>!rbplay ID</th><th>Station Name</th></tr>'
+                                for s in rb_stations:
+                                    stationid = s['id']
+                                    stationname = s['stationname']
+                                    # msg += f'<tr><td>{stationid}</td><td>{stationname}</td>'
+                                    msg += '<tr><td>%s</td><td>%s</td>' % (stationid, stationname)
+                                    if len(msg) <= 5000:
+                                        self.send_msg(msg, text)
+                                    # Shorten message if message too long (stage II)
+                                    else:
+                                        logging.debug('Result too long stage II')
+                                        msg = var.config.get('strings', 'rbqueryresult') + " :" + ' (shortened L2)'
+                                        msg += '!rbplay ID - Station Name'
+                                        for s in rb_stations:
+                                            stationid = s['id']
+                                            stationname = s['stationname'][:12]
+                                            # msg += f'{stationid} - {stationname}'
+                                            msg += '%s - %s' % (stationid, stationname)
+                                            if len(msg) <= 5000:
+                                                self.send_msg(msg, text)
+                                            # Message still too long
+                                            else:
+                                                self.send_msg('Query result too long to post (> 5000 characters), please try another query.', text)
             # Play a secific station (by id) from http://www.radio-browser.info API
             elif command == var.config.get('command', 'rb_play'):
                 logging.debug('Play a station by ID')