diff --git a/packages/flutter_chat_ui/lib/src/chat_message/chat_message.dart b/packages/flutter_chat_ui/lib/src/chat_message/chat_message.dart
index 0c28bbd48..842309d66 100644
--- a/packages/flutter_chat_ui/lib/src/chat_message/chat_message.dart
+++ b/packages/flutter_chat_ui/lib/src/chat_message/chat_message.dart
@@ -148,21 +148,28 @@ class ChatMessage extends StatelessWidget {
           ),
         GestureDetector(
           onTapUp:
-              (details) => onMessageTap?.call(
-                context,
-                message,
-                index: index,
-                details: details,
-              ),
+              onMessageTap != null
+                  ? (details) => onMessageTap.call(
+                    context,
+                    message,
+                    index: index,
+                    details: details,
+                  )
+                  : null,
           onDoubleTap:
-              () => onMessageDoubleTap?.call(context, message, index: index),
+              onMessageDoubleTap != null
+                  ? () =>
+                      onMessageDoubleTap.call(context, message, index: index)
+                  : null,
           onLongPressStart:
-              (details) => onMessageLongPress?.call(
-                context,
-                message,
-                index: index,
-                details: details,
-              ),
+              onMessageLongPress != null
+                  ? (details) => onMessageLongPress.call(
+                    context,
+                    message,
+                    index: index,
+                    details: details,
+                  )
+                  : null,
           child: FadeTransition(
             opacity: curvedAnimation,
             child: SizeTransition(