diff --git a/CMakeLists.txt b/CMakeLists.txt
index d712c99f0..ba0195b57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,11 +187,6 @@ else()
     unset(CMAKE_CXX_CLANG_TIDY)
 endif()
 
-if (APPLE)
-    # build macOS File Provider module
-    option(BUILD_FILE_PROVIDER_MODULE "BUILD_FILE_PROVIDER_MODULE" OFF)
-endif()
-
 # When this option is enabled, 5xx errors are not added to the blacklist
 # Normally you don't want to enable this option because if a particular file
 # triggers a bug on the server, you want the file to be blacklisted.
diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake
index 6c4e146d5..40d0f2ff4 100644
--- a/NEXTCLOUD.cmake
+++ b/NEXTCLOUD.cmake
@@ -78,5 +78,5 @@ if(WIN32)
 endif()
 
 if (APPLE)
-    set( BUILD_FILE_PROVIDER_MODULE OFF )
+    option( BUILD_FILE_PROVIDER_MODULE "Build the macOS virtual files File Provider module" OFF )
 endif()
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 2713eaea5..18b01f6c2 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -403,7 +403,7 @@ Application::Application(int &argc, char **argv)
         }
     }
 
-#if (BUILD_FILE_PROVIDER_MODULE)
+#if defined(BUILD_FILE_PROVIDER_MODULE)
     _fileProvider.reset(new Mac::FileProvider);
 #endif