diff --git a/codegen/sync.fsm b/codegen/sync.fsm
index 9cb0388a..d94a61e4 100644
--- a/codegen/sync.fsm
+++ b/codegen/sync.fsm
@@ -728,32 +728,26 @@ protocol Sync 1 {
 
         }
         state WaitForGroupUpdate {
+            on GroupSyncUpdate {
 
-        }
+            }
 
-        // reflect incoming ManagedGroup messages
+            on RequestUpdate {
 
-        message GroupSyncCreate 2 {
-            field Identity groupIdentity;
-            field Identity manager;
+            }
         }
 
-        message GroupSyncAdopted 3 {
-            field Identity groupIdentity;
-            field Identity member;
-        }
+        // reflect incoming ManagedGroup messages
 
-        message GroupSyncDissolve 4 {
-            field Identity groupIdentity;
-            field Identity manager;
+        message GroupSyncUpdate 2 {
+            embed Distribution ManagedGroup msg;
         }
 
         // in case a ManagedGroup message arrives for an unknown group ask the
         // other devices
 
-        message GroupSyncRequest 5 {
+        message GroupSyncRequest 3 {
             field Identity groupIdentity;
-            field Identity manager;
         }
     }
 }