diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index 29fc9b7ec0..11497b1ce1 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -1676,12 +1676,16 @@ _qt_msg_handler_old old_qtmsg_handler = nullptr;
 void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     Q_UNUSED(context);
-#ifdef FC_DEBUG
     switch (type)
     {
     case QtInfoMsg:
     case QtDebugMsg:
+#ifdef FC_DEBUG
         Base::Console().Message("%s\n", msg.toUtf8().constData());
+#else
+        // do not stress user with Qt internals but write to log file if enabled
+        Base::Console().Log("%s\n", msg.toUtf8().constData());
+#endif
         break;
     case QtWarningMsg:
         Base::Console().Warning("%s\n", msg.toUtf8().constData());
@@ -1694,13 +1698,9 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
         abort();                    // deliberately core dump
     }
 #ifdef FC_OS_WIN32
-    if (old_qtmsg_handler)
+    if (old_qtmsg_handler) {
         (*old_qtmsg_handler)(type, context, msg);
-#endif
-#else
-    // do not stress user with Qt internals but write to log file if enabled
-    Q_UNUSED(type);
-    Base::Console().Log("%s\n", msg.toUtf8().constData());
+    }
 #endif
 }