diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9ef5b70738..247b112ba3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,7 @@ Broker:
   plugin should not be accessing them.
 - Give compile time warning if libwebsockets compiled without external poll
   support. Closes #2060.
+- Fix memory tracking not being available on FreeBSD or macOS. Closes #2096.
 
 Client library:
 - Fix mosquitto_{pub|sub}_topic_check() functions not returning MOSQ_ERR_INVAL
diff --git a/lib/memory_mosq.h b/lib/memory_mosq.h
index da14991354..48fadf8c6d 100644
--- a/lib/memory_mosq.h
+++ b/lib/memory_mosq.h
@@ -22,8 +22,10 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #include <stdio.h>
 #include <sys/types.h>
 
-#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && defined(__GLIBC__)
-#define REAL_WITH_MEMORY_TRACKING
+#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER)
+#  if defined(__APPLE__) || defined(__FreeBSD__) || defined(__GLIBC__)
+#    define REAL_WITH_MEMORY_TRACKING
+#  endif
 #endif
 
 void *mosquitto__calloc(size_t nmemb, size_t size);