diff --git a/CMakeLists.txt b/CMakeLists.txt
index 073cec97d..ccc703512 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1581,6 +1581,13 @@ endif()
 
 if(NOT ENABLE_LOG)
     message(STATUS "Logging is not enabled")
+    if(CMAKE_VERSION VERSION_GREATER 3.11.0)
+        target_compile_definitions(Glog::glog INTERFACE -DGOOGLE_STRIP_LOG=1)
+    else()
+        set_property(TARGET Glog::glog APPEND PROPERTY
+            INTERFACE_COMPILE_DEFINITIONS GOOGLE_STRIP_LOG=1
+        )
+    endif()
 endif()
 
 
diff --git a/docs/changelog.md b/docs/changelog.md
index a17d6e479..744d51120 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -81,6 +81,10 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades <carles.fernandez@cttc
   per sample.
 - Fixed a bug in signal sources that made the number of samples parameter
   ignored when too large (that is, larger than 2^31-1).
+- Fixed the building option `-DENABLE_LOG=OFF`, which strips internal logging
+  from the binary and can help to reduce its size and speed up the receiver. In
+  binaries with enabled logging, it can be still disabled by passing the command
+  line flag `--minloglevel=3` to `gnss-sdr`.
 
 &nbsp;
 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index b6c01d75e..cbbbf1466 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -38,11 +38,6 @@ target_link_libraries(gnss-sdr
 
 target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
-# Disable internal logging
-if(NOT ENABLE_LOG)
-    target_compile_definitions(gnss-sdr PRIVATE -DGOOGLE_STRIP_LOG=1)
-endif()
-
 if(ENABLE_CUDA)
     if(NOT CMAKE_VERSION VERSION_GREATER 3.11)
         target_link_libraries(gnss-sdr