diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0176eaf9a..d6c978f72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,6 +105,7 @@ if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)
     set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_NAME}.app")
     set(LIB_INSTALL_DIR "${APPLICATION_NAME}.app/Contents/MacOS")
     set(BIN_INSTALL_DIR "${APPLICATION_NAME}.app/Contents/MacOS")
+    add_definitions(-DBUILD_OWNCLOUD_OSX_BUNDLE)
 endif()
 
 
diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index db04b01a4..7de521ca7 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -99,7 +99,7 @@ Systray::Systray()
 
     qmlRegisterType<WheelHandler>("com.nextcloud.desktopclient", 1, 0, "WheelHandler");
 
-#ifdef Q_OS_MACOS
+#if defined(Q_OS_MACOS) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
     setUserNotificationCenterDelegate();
     checkNotificationAuth(MacNotificationAuthorizationOptions::Default); // No provisional auth, ask user explicitly first time
     registerNotificationCategories(QString(tr("Download")));
@@ -307,7 +307,7 @@ void Systray::showMessage(const QString &title, const QString &message, MessageI
         QDBusConnection::sessionBus().asyncCall(method);
     } else
 #endif
-#ifdef Q_OS_OSX
+#if defined(Q_OS_MACOS) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
         if (canOsXSendUserNotification()) {
         sendOsXUserNotification(title, message);
     } else
@@ -319,7 +319,7 @@ void Systray::showMessage(const QString &title, const QString &message, MessageI
 
 void Systray::showUpdateMessage(const QString &title, const QString &message, const QUrl &webUrl)
 {
-#ifdef Q_OS_MACOS
+#if defined(Q_OS_MACOS) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
     sendOsXUpdateNotification(title, message, webUrl);
 #else // TODO: Implement custom notifications (i.e. actionable) for other OSes
     Q_UNUSED(webUrl);
diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp
index af8fad47b..cb3dd3107 100644
--- a/src/gui/updater/updater.cpp
+++ b/src/gui/updater/updater.cpp
@@ -141,7 +141,7 @@ Updater *Updater::create()
         return nullptr;
     }
 
-#if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
+#if defined(Q_OS_MACOS) && defined(HAVE_SPARKLE) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
     return new SparkleUpdater(url);
 #elif defined(Q_OS_WIN32)
     // Also for MSI