diff --git a/android_env/components/adb_controller.py b/android_env/components/adb_controller.py
index a8a1b9d..6031ffa 100644
--- a/android_env/components/adb_controller.py
+++ b/android_env/components/adb_controller.py
@@ -54,7 +54,7 @@ def command_prefix(self, include_device_name: bool = True) -> list[str]:
         '-P',
         str(self._config.adb_server_port),
     ]
-    if include_device_name:
+    if include_device_name and self._config.device_name:
       command_prefix.extend(['-s', self._config.device_name])
     return command_prefix