diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart
index f3e48a8b6..63895d550 100644
--- a/lib/pangea/choreographer/controllers/choreographer.dart
+++ b/lib/pangea/choreographer/controllers/choreographer.dart
@@ -593,6 +593,7 @@ class Choreographer {
     if (isFetching) return false;
     if (errorService.isError) return true;
     if (itEnabled && isRunningIT) return false;
+    if (igc.igcTextData == null) return false;
 
     final hasITMatches =
         igc.igcTextData!.matches.any((match) => match.isITStart);
diff --git a/lib/pangea/choreographer/widgets/send_button.dart b/lib/pangea/choreographer/widgets/send_button.dart
index f5e358a31..6fba75395 100644
--- a/lib/pangea/choreographer/widgets/send_button.dart
+++ b/lib/pangea/choreographer/widgets/send_button.dart
@@ -56,7 +56,10 @@ class ChoreographerSendButtonState extends State<ChoreographerSendButton> {
               color: widget.controller.choreographer.assistanceState
                   .stateColor(context),
               onPressed: () {
-                widget.controller.choreographer.send(context);
+                widget.controller.choreographer.canSendMessage
+                    ? widget.controller.choreographer.send(context)
+                    : widget.controller.choreographer.igc
+                        .showFirstMatch(context);
               },
               tooltip: L10n.of(context)!.send,
             ),