diff --git a/lib/roles/device/plugins/group.js b/lib/roles/device/plugins/group.js
index 52cab793..08b7098f 100644
--- a/lib/roles/device/plugins/group.js
+++ b/lib/roles/device/plugins/group.js
@@ -32,7 +32,11 @@ module.exports = syrup.serial()
     plugin.join = function(newGroup, timeout) {
       return plugin.get()
         .then(function() {
-          throw new grouputil.AlreadyGroupedError()
+          if (currentGroup.group !== newGroup.group) {
+            throw new grouputil.AlreadyGroupedError()
+          }
+
+          return currentGroup
         })
         .catch(grouputil.NoGroupError, function() {
           currentGroup = newGroup