diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.cpp b/src/ATBAPP/ATBDeviceControllerPlugin.cpp
index b71b162..fbc58cb 100644
--- a/src/ATBAPP/ATBDeviceControllerPlugin.cpp
+++ b/src/ATBAPP/ATBDeviceControllerPlugin.cpp
@@ -82,6 +82,8 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->diag = new DeviceControllerDiag(this->persistentData, this);
     connect(this->diag, &DeviceControllerDiag::newVoltage, this, &ATBDeviceControllerPlugin::onNewVoltage);
 
+    int diagTimeout = settings.value("ATBDeviceControllerPlugin/diagTimeout", "45").toInt();
+    this->diag->setTimeout(diagTimeout);
 
     // currentSelectedTicketType - number of used "Kombiticket" (deprecated) use TICKET_VARIANT in future
     this->currentSelectedTicketType = 0;
diff --git a/src/ATBAPP/DeviceControllerDiag.cpp b/src/ATBAPP/DeviceControllerDiag.cpp
index 0774275..1bcac63 100644
--- a/src/ATBAPP/DeviceControllerDiag.cpp
+++ b/src/ATBAPP/DeviceControllerDiag.cpp
@@ -20,7 +20,7 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
     , pData(pData)
 {
     diagRequestTimeoutTimer = new QTimer(this);
-    diagRequestTimeoutTimer->setInterval(1000*20);  // 20s
+    diagRequestTimeoutTimer->setInterval(1000*45);
     diagRequestTimeoutTimer->setSingleShot(true);
     connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
 }
@@ -42,6 +42,11 @@ void DeviceControllerDiag::diagReInit()
     this->_isErrorState = false;
 }
 
+void DeviceControllerDiag::setTimeout(int timeout)
+{
+    this->diagRequestTimeoutTimer->setInterval(1000 * timeout);
+}
+
 void DeviceControllerDiag::diagRequest()
 {
     qCritical() << "DeviceControllerDiag::diagRequest()";
diff --git a/src/ATBAPP/DeviceControllerDiag.h b/src/ATBAPP/DeviceControllerDiag.h
index ca6aaa2..3555877 100644
--- a/src/ATBAPP/DeviceControllerDiag.h
+++ b/src/ATBAPP/DeviceControllerDiag.h
@@ -80,7 +80,7 @@ public:
     bool isOperatingState();
     QSet<DeviceController::State> getCurrentMachineState();
 
-
+    void setTimeout(int timeout);
 
 public slots:
     /**