diff --git a/wpiutil/src/main/native/include/wpi/Logger.h b/wpiutil/src/main/native/include/wpi/Logger.h
index 4cd2a8625b..00b9902e44 100644
--- a/wpiutil/src/main/native/include/wpi/Logger.h
+++ b/wpiutil/src/main/native/include/wpi/Logger.h
@@ -60,8 +60,11 @@ class Logger {
   unsigned int m_min_level = 20;
 };
 
-#define WPI_LOG(logger_inst, level, format, ...) \
-  (logger_inst).Log(level, __FILE__, __LINE__, FMT_STRING(format), __VA_ARGS__)
+#define WPI_LOG(logger_inst, level, format, ...)                          \
+  if ((logger_inst).HasLogger() && level >= (logger_inst).min_level()) {  \
+    (logger_inst)                                                         \
+        .Log(level, __FILE__, __LINE__, FMT_STRING(format), __VA_ARGS__); \
+  }
 
 #define WPI_ERROR(inst, format, ...) \
   WPI_LOG(inst, ::wpi::WPI_LOG_ERROR, format, __VA_ARGS__)