diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp
index 4dd7b437e6e..98054138b7c 100644
--- a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp
+++ b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp
@@ -145,7 +145,7 @@ struct nsTraceRefcntStats {
 
   // I hope to turn this on for everybody once we hit it a little less.
 #define ASSERT_ACTIVITY_IS_LEGAL                                             \
-  NS_ASSERTION(gActivityTLS != BAD_TLS_INDEX &&                          \
+  NS_WARN_IF_FALSE(gActivityTLS != BAD_TLS_INDEX &&                          \
              NS_PTR_TO_INT32(PR_GetThreadPrivate(gActivityTLS)) == 0,        \
              "XPCOM objects created/destroyed from static ctor/dtor");