diff --git a/admin/assets/javascripts/admin/components/modal/test-integration.hbs b/admin/assets/javascripts/admin/components/modal/test-integration.hbs
index 717910c..02df093 100644
--- a/admin/assets/javascripts/admin/components/modal/test-integration.hbs
+++ b/admin/assets/javascripts/admin/components/modal/test-integration.hbs
@@ -17,7 +17,10 @@
             </label>
           </td>
           <td>
-            <ChooseTopic @topicChangedCallback={{this.newTopicSelected}} />
+            <ChooseTopic
+              @topicChangedCallback={{this.newTopicSelected}}
+              @selectedTopicId={{this.topicId}}
+            />
           </td>
         </tr>
       </tbody>
diff --git a/admin/assets/javascripts/admin/components/modal/test-integration.js b/admin/assets/javascripts/admin/components/modal/test-integration.js
index aff3b9b..06479b2 100644
--- a/admin/assets/javascripts/admin/components/modal/test-integration.js
+++ b/admin/assets/javascripts/admin/components/modal/test-integration.js
@@ -32,6 +32,6 @@ export default class TestIntegration extends Component {
 
   @action
   newTopicSelected(topic) {
-    this.topicId = topic.id;
+    this.topicId = topic?.id;
   }
 }