diff --git a/sdk/android/api/org/webrtc/EglRenderer.java b/sdk/android/api/org/webrtc/EglRenderer.java
index e810053..42a07c0 100644
--- a/sdk/android/api/org/webrtc/EglRenderer.java
+++ b/sdk/android/api/org/webrtc/EglRenderer.java
@@ -330,9 +330,9 @@
       if (renderThread != null) {
         final StackTraceElement[] renderStackTrace = renderThread.getStackTrace();
         if (renderStackTrace.length > 0) {
-          logD("EglRenderer stack trace:");
+          logW("EglRenderer stack trace:");
           for (StackTraceElement traceElem : renderStackTrace) {
-            logD(traceElem.toString());
+            logW(traceElem.toString());
           }
         }
       }
@@ -729,4 +729,8 @@
   private void logD(String string) {
     Logging.d(TAG, name + string);
   }
+
+  private void logW(String string) {
+    Logging.w(TAG, name + string);
+  }
 }
diff --git a/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
index 018fb76..f5d1ee1 100644
--- a/sdk/android/api/org/webrtc/PeerConnectionFactory.java
+++ b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
@@ -490,9 +490,9 @@
     if (thread != null) {
       StackTraceElement[] stackTraces = thread.getStackTrace();
       if (stackTraces.length > 0) {
-        Logging.d(TAG, threadName + " stacks trace:");
+        Logging.w(TAG, threadName + " stacks trace:");
         for (StackTraceElement stackTrace : stackTraces) {
-          Logging.d(TAG, stackTrace.toString());
+          Logging.w(TAG, stackTrace.toString());
         }
       }
     }
