diff --git a/src/apps/deskflow-gui/deskflow-gui.cpp b/src/apps/deskflow-gui/deskflow-gui.cpp
index ef7f07aa2..f323da2eb 100644
--- a/src/apps/deskflow-gui/deskflow-gui.cpp
+++ b/src/apps/deskflow-gui/deskflow-gui.cpp
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
   qInfo("%s v%s", kAppName, kDisplayVersion);
 
   dotenv();
-  Logger::instance().loadEnvVars();
+  Logger::instance()->loadEnvVars();
 
 #if defined(Q_OS_MAC)
 
diff --git a/src/lib/gui/Logger.cpp b/src/lib/gui/Logger.cpp
index 391e10fb2..f0c8496cf 100644
--- a/src/lib/gui/Logger.cpp
+++ b/src/lib/gui/Logger.cpp
@@ -23,8 +23,6 @@ const auto kForceDebugMessages = QStringList{
     "Unable to obtain clipboard."
 };
 
-Logger Logger::s_instance;
-
 QString printLine(FILE *out, const QString &type, const QString &message, const QString &fileLine = "")
 {
 
diff --git a/src/lib/gui/Logger.h b/src/lib/gui/Logger.h
index 33f348b03..5519a4f17 100644
--- a/src/lib/gui/Logger.h
+++ b/src/lib/gui/Logger.h
@@ -15,9 +15,10 @@ class Logger : public QObject
   Q_OBJECT
 
 public:
-  static Logger &instance()
+  static Logger *instance()
   {
-    return s_instance;
+    static Logger m;
+    return &m;
   }
 
   void loadEnvVars();
@@ -27,7 +28,6 @@ Q_SIGNALS:
   void newLine(const QString &line);
 
 private:
-  static Logger s_instance;
 #ifdef NDEBUG
   bool m_debug = false;
 #else
diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp
index f6dc0865f..f41dda93a 100644
--- a/src/lib/gui/Messages.cpp
+++ b/src/lib/gui/Messages.cpp
@@ -90,7 +90,7 @@ QString fileLine(const QMessageLogContext &context)
 void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message)
 {
   const auto fileLine = messages::fileLine(context);
-  Logger::instance().handleMessage(type, fileLine, message);
+  Logger::instance()->handleMessage(type, fileLine, message);
 
   if (type == QtFatalMsg || type == QtCriticalMsg) {
     showErrorDialog(message, fileLine, type);
diff --git a/src/lib/gui/widgets/LogWidget.cpp b/src/lib/gui/widgets/LogWidget.cpp
index 313200d95..46c3707b5 100644
--- a/src/lib/gui/widgets/LogWidget.cpp
+++ b/src/lib/gui/widgets/LogWidget.cpp
@@ -31,7 +31,7 @@ LogWidget::LogWidget(QWidget *parent) : QWidget{parent}, m_textLog{new QPlainTex
   setLayout(layout);
 
   connect(
-      &deskflow::gui::Logger::instance(), &deskflow::gui::Logger::newLine, m_textLog, &QPlainTextEdit::appendPlainText
+      deskflow::gui::Logger::instance(), &deskflow::gui::Logger::newLine, m_textLog, &QPlainTextEdit::appendPlainText
   );
 }