diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunningState.java b/plugins/android/src/org/jetbrains/android/run/AndroidRunningState.java
index f485f2e70bf4..01e0121a8f6b 100644
--- a/plugins/android/src/org/jetbrains/android/run/AndroidRunningState.java
+++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunningState.java
@@ -419,7 +419,7 @@ public abstract class AndroidRunningState implements RunProfileState, AndroidDeb
     if (!isAndroidSdk15OrHigher()) {
       return true;
     }
-    String avdName = device.getAvdName();
+    String avdName = device.isEmulator() ? device.getAvdName() : null;
     if (myAvdName != null) {
       return myAvdName.equals(avdName);
     }