diff --git a/TODO b/TODO
index 39fde51cce023a1557ae7212c02898a519b53543..a8ea0055739d8fb286f26647e9fa4a0a140e5d20 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 # Required for release
 
-- Ensure all logging is conditional
 - Prevent accidental shutdown
   - Add pop-up confirming router shutdown
   - OR: make router button long-press
diff --git a/src/net/i2p/android/router/util/Util.java b/src/net/i2p/android/router/util/Util.java
index 1902f9e34fc651d6fd4c45e5a374c97b9038f912..9a190fefa46a5d5c78bb6b138dc5dad33456423b 100644
--- a/src/net/i2p/android/router/util/Util.java
+++ b/src/net/i2p/android/router/util/Util.java
@@ -7,7 +7,6 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
 import net.i2p.I2PAppContext;
-import net.i2p.util.Log;
 
 public abstract class Util {
     private static final boolean _isEmulator = Build.MODEL.equals("sdk");
@@ -54,11 +53,13 @@ public abstract class Util {
     public static void e(String m, Throwable t) {
         I2PAppContext ctx = I2PAppContext.getCurrentContext();
         if (ctx != null)
-            ctx.logManager().getLog(Util.class).log(Log.ERROR, m, t);
-        else if (t != null)
-            android.util.Log.e(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
-        else
-            android.util.Log.e(ANDROID_TAG, m);
+            ctx.logManager().getLog(Util.class).error(m, t);
+        else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.ERROR)) {
+            if (t != null)
+                android.util.Log.e(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+            else
+                android.util.Log.e(ANDROID_TAG, m);
+        }
     }
 
     public static void w(String m) {
@@ -68,11 +69,13 @@ public abstract class Util {
     public static void w(String m, Throwable t) {
         I2PAppContext ctx = I2PAppContext.getCurrentContext();
         if (ctx != null)
-            ctx.logManager().getLog(Util.class).log(Log.WARN, m, t);
-        else if (t != null)
-            android.util.Log.w(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
-        else
-            android.util.Log.w(ANDROID_TAG, m);
+            ctx.logManager().getLog(Util.class).warn(m, t);
+        else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.WARN)) {
+            if (t != null)
+                android.util.Log.w(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+            else
+                android.util.Log.w(ANDROID_TAG, m);
+        }
     }
 
     public static void i(String m) {
@@ -82,11 +85,13 @@ public abstract class Util {
     public static void i(String m, Throwable t) {
         I2PAppContext ctx = I2PAppContext.getCurrentContext();
         if (ctx != null)
-            ctx.logManager().getLog(Util.class).log(Log.INFO, m, t);
-        else if (t != null)
-            android.util.Log.i(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
-        else
-            android.util.Log.i(ANDROID_TAG, m);
+            ctx.logManager().getLog(Util.class).info(m, t);
+        else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.INFO)) {
+            if (t != null)
+                android.util.Log.i(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+            else
+                android.util.Log.i(ANDROID_TAG, m);
+        }
     }
     public static void d(String m) {
         d(m, null);
@@ -95,10 +100,12 @@ public abstract class Util {
     public static void d(String m, Throwable t) {
         I2PAppContext ctx = I2PAppContext.getCurrentContext();
         if (ctx != null)
-            ctx.logManager().getLog(Util.class).log(Log.DEBUG, m, t);
-        else if (t != null)
-            android.util.Log.d(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
-        else
-            android.util.Log.d(ANDROID_TAG, m);
+            ctx.logManager().getLog(Util.class).debug(m, t);
+        else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.DEBUG)) {
+            if (t != null)
+                android.util.Log.d(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+            else
+                android.util.Log.d(ANDROID_TAG, m);
+        }
     }
 }