diff --git a/mqtt.cpp b/mqtt.cpp
index eec0eef5495b09fd8ab15b2883dbe641b32f8d49..46955483c1f556cf594ec80e93938d4595ca424c 100644
--- a/mqtt.cpp
+++ b/mqtt.cpp
@@ -86,7 +86,7 @@ namespace mqtt {
     LedEffects::showKITTWheel(color::green, 1);
   }
 
-  void calibrateSensor(String messageString) {
+  void calibrateSensorToSpecificPPM(String messageString) {
     messageString.replace("calibrate ", "");
     long int calibrationLevel = messageString.toInt();
     if (calibrationLevel >= 400 && calibrationLevel <= 2000) {
@@ -143,9 +143,10 @@ namespace mqtt {
       setCO2forDebugging(messageString);
     } else if (messageString.startsWith("timer ")) {
       setTimer(messageString);
+    } else if (messageString == "calibrate") {
+      sensor::startCalibrationProcess();
     } else if (messageString.startsWith("calibrate ")) {
-      calibrateSensor(messageString);
-//      config::atmospheric_co2_concentration
+      calibrateSensorToSpecificPPM(messageString);
     } else if (messageString.startsWith("mqtt ")) {
       setMQTTinterval(messageString);
     } else if (messageString.startsWith("csv ")) {