diff --git a/src/pump_bot.py b/src/pump_bot.py
index fe138c7..7bf9bd8 100755
--- a/src/pump_bot.py
+++ b/src/pump_bot.py
@@ -162,8 +162,8 @@ def markup(ctx: Optional[bot.Context]) -> Optional[ReplyKeyboardMarkup]:
     if ctx.user_id in config['bot']['silent_users']:
         buttons.append([ctx.lang('enable_silently'), ctx.lang('disable_silently')])
 
-    buttons.append([ctx.lang('status')])
     buttons.append([ctx.lang('start_watering'), ctx.lang('stop_watering')])
+    buttons.append([ctx.lang('status')])
 
     return ReplyKeyboardMarkup(buttons, one_time_keyboard=False)
 
@@ -172,5 +172,14 @@ if __name__ == '__main__':
     mqtt = MqttNode(node_id=config.get('mqtt_water_relay.node_id'))
     mqtt_relay_module = add_mqtt_module(mqtt, 'relay')
 
+    mqtt.configure_tls()
+    mqtt.connect_and_loop(loop_forever=False)
+
     bot.enable_logging(BotType.PUMP)
     bot.run()
+
+    try:
+        mqtt.disconnect()
+    except:
+        pass
+