diff --git a/lib/roles/device.js b/lib/roles/device.js
index 9414347f..69e376ce 100644
--- a/lib/roles/device.js
+++ b/lib/roles/device.js
@@ -47,6 +47,15 @@ module.exports = function(options) {
     var wrapper = wire.Envelope.decode(data)
     channels.keepalive(channel)
     switch (wrapper.type) {
+      case wire.MessageType.PROBE:
+        var message = wire.ProbeMessage.decode(wrapper.message)
+        adb.getPropertiesAsync(options.serial)
+          .then(function(properties) {
+            identity = devutil.makeIdentity(options.serial, properties)
+            push.send([channel,
+              wireutil.makeDeviceIdentityMessage(options.serial, identity)])
+          })
+        break
       case wire.MessageType.GROUP:
         var message = wire.GroupMessage.decode(wrapper.message)
           , groupChannel = message.channel
@@ -58,15 +67,6 @@ module.exports = function(options) {
             wireutil.makeJoinGroupMessage(options.serial)])
         }
         break
-      case wire.MessageType.PROBE:
-        var message = wire.ProbeMessage.decode(wrapper.message)
-        adb.getPropertiesAsync(options.serial)
-          .then(function(properties) {
-            identity = devutil.makeIdentity(options.serial, properties)
-            push.send([channel,
-              wireutil.makeDeviceIdentityMessage(options.serial, identity)])
-          })
-        break
       case wire.MessageType.SHELL_COMMAND:
         var message = wire.ShellCommandMessage.decode(wrapper.message)
         log.info('Running shell command "%s"', message.command.join(' '))