diff --git a/mainwindow.cpp b/mainwindow.cpp
index cf68c86..fe18390 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1619,13 +1619,12 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   if (!m_valid) throw std::runtime_error {"Fatal initialization exception"};
 }
 
-QDate eol(2019, 2, 21);
+QDate eol(2019, 3, 11);
 
 void MainWindow::checkExpiryWarningMessage()
 {
     if(QDateTime::currentDateTimeUtc().date() > eol){
-        MessageBox::critical_message (this, QString("This pre-release development build of JS8Call has reached its end-of-life. Please check for an upgrade to the latest version. In the meantime, the software will continue to operate as usual."));
-        return;
+        MessageBox::critical_message (this, QString("This pre-release development build of JS8Call has reached its end-of-life. Please check for an upgrade to the latest version."));
     }
 }
 
@@ -5955,6 +5954,8 @@ bool MainWindow::ensureCreateMessageReady(const QString &text){
 }
 
 QString MainWindow::createMessage(QString const& text){
+    checkExpiryWarningMessage();
+
     return createMessageTransmitQueue(replaceMacros(text, buildMacroValues(), false), true);
 }