diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ba61649a852..ac2ee25c78ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -692,6 +692,12 @@ endif()
 if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64)
   set(FEATURE_EVENT_TRACE 1)
 endif()
+if(FEATURE_EVENT_TRACE)
+    add_definitions(-DFEATURE_EVENT_TRACE=1)
+endif()
+if(CLR_CMAKE_PLATFORM_UNIX)
+  add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1)
+endif()
 
 if(CLR_CMAKE_PLATFORM_UNIX)
   add_subdirectory(src/ToolBox/SOS/lldbplugin)
@@ -823,12 +829,6 @@ if(CLR_CMAKE_PLATFORM_UNIX)
     add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI)
     add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM)
 endif(CLR_CMAKE_PLATFORM_UNIX)
-if(FEATURE_EVENT_TRACE)
-    add_definitions(-DFEATURE_EVENT_TRACE=1)
-    if(CLR_CMAKE_PLATFORM_UNIX)
-        add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1)
-    endif(CLR_CMAKE_PLATFORM_UNIX)
-endif(FEATURE_EVENT_TRACE)
 add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO)
 # NetBSD doesn't implement this feature
 if(NOT CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
diff --git a/clr.coreclr.props b/clr.coreclr.props
index d42b9f442f2e..7e9099faec98 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -84,12 +84,9 @@
     <FeatureSvrGc Condition="'$(TargetArch)' != 'arm'">true</FeatureSvrGc>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetsLinux)' == 'true'">
-    <FeatureXplatEventSource>true</FeatureXplatEventSource>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
     <FeaturePal>true</FeaturePal>
+    <FeatureXplatEventSource>true</FeatureXplatEventSource>
 
     <FeatureStubsAsIL>true</FeatureStubsAsIL>
 
diff --git a/src/vm/eventtracepriv.h b/src/vm/eventtracepriv.h
index 6b2a26672885..0689665851be 100644
--- a/src/vm/eventtracepriv.h
+++ b/src/vm/eventtracepriv.h
@@ -412,9 +412,13 @@ class BulkStaticsLogger
 class XplatEventSourceLogger
 {
 public:
+#ifdef FEATURE_EVENT_TRACE
     static void QCALLTYPE LogEventSource(__in_z int eventID, __in_z LPCWSTR eventName, __in_z LPCWSTR eventSourceName, __in_z LPCWSTR payload);
-
     static BOOL QCALLTYPE IsEventSourceLoggingEnabled();
+#else
+    static void QCALLTYPE LogEventSource(__in_z int eventID, __in_z LPCWSTR eventName, __in_z LPCWSTR eventSourceName, __in_z LPCWSTR payload) {}
+    static BOOL QCALLTYPE IsEventSourceLoggingEnabled() { return false; }
+#endif
 };
 
 #endif //defined(FEATURE_EVENTSOURCE_XPLAT)