diff --git a/libwvdrmengine/cdm/util/include/log.h b/libwvdrmengine/cdm/util/include/log.h
index f4d5e729..d1658e3f 100644
--- a/libwvdrmengine/cdm/util/include/log.h
+++ b/libwvdrmengine/cdm/util/include/log.h
@@ -91,17 +91,25 @@ CORE_UTIL_EXPORT void Log(const char* file, const char* function, int line,
 #endif
 
 // Log APIs
-#ifndef LOGE
-#  define LOGE(...) \
+#ifdef CDM_DISABLE_LOGGING
+#  define LOGE(...) (void)0
+#  define LOGW(...) (void)0
+#  define LOGI(...) (void)0
+#  define LOGD(...) (void)0
+#  define LOGV(...) (void)0
+#else
+#  ifndef LOGE
+#    define LOGE(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_ERROR, __VA_ARGS__)
-#  define LOGW(...) \
+#    define LOGW(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_WARN, __VA_ARGS__)
-#  define LOGI(...) \
+#    define LOGI(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_INFO, __VA_ARGS__)
-#  define LOGD(...) \
+#    define LOGD(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_DEBUG, __VA_ARGS__)
-#  define LOGV(...) \
+#    define LOGV(...) \
     Log(__FILE__, __func__, __LINE__, wvutil::CDM_LOG_VERBOSE, __VA_ARGS__)
+#  endif
 #endif
 }  // namespace wvutil