diff --git a/comm_b.c b/comm_b.c
index 8311c64..41e195d 100644
--- a/comm_b.c
+++ b/comm_b.c
@@ -581,7 +581,7 @@ static int decodeBDS50(struct modesMessage *mm, bool store)
 
         if (gs_valid) {
             mm->gs_valid = 1;
-            mm->gs.v0 = mm->gs.v2 = gs;
+            mm->gs.v0 = mm->gs.v2 = mm->gs.selected = gs;
         }
 
         if (track_rate_valid) {