diff --git a/opentech/apply/funds/models/applications.py b/opentech/apply/funds/models/applications.py
index 847dfd1bef376227f05fce4b059161d3cffa5729..84c16c80818723f38a24f4ff296023a0fdd2b906 100644
--- a/opentech/apply/funds/models/applications.py
+++ b/opentech/apply/funds/models/applications.py
@@ -303,8 +303,11 @@ class RoundBase(WorkflowStreamForm, SubmittableStreamForm):  # type: ignore
                 for toggle_block_id, toggle_field in submission.group_toggle_blocks:
                     try:
                         initial_values[toggle_block_id] = toggle_field.value['choices'][0]
-                    except (KeyError, IndexError):
+                    except IndexError:
+                        initial_values[toggle_block_id] = 'yes'
+                    except KeyError:
                         pass
+
         except (submission_class.DoesNotExist, ValueError):
             pass