diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index a3962aa8..3438c24c 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1277,7 +1277,8 @@ void MainWindow::bonjourInstallFinished()
 
 void MainWindow::windowStateChanged()
 {
-    if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray())
+    // If we are minimising and minimise to tray is enabled and system tray is available then hide the window
+    if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray() && QSystemTrayIcon::isSystemTrayAvailable())
         hide();
 }