diff --git a/app/lib/pages/apps/app_detail/app_detail.dart b/app/lib/pages/apps/app_detail/app_detail.dart
index 77eee2a1f45..cf558d52359 100644
--- a/app/lib/pages/apps/app_detail/app_detail.dart
+++ b/app/lib/pages/apps/app_detail/app_detail.dart
@@ -687,7 +687,7 @@ class _AppDetailPageState extends State<AppDetailPage> {
 
                               await Share.share(
                                 'https://h.omi.me/apps/${app.id}',
-                                subject: app.name,
+                                subject: app.name.isEmpty ? null : app.name,
                                 sharePositionOrigin: sharePositionOrigin,
                               );
                             },
diff --git a/app/lib/pages/chat/widgets/ai_message.dart b/app/lib/pages/chat/widgets/ai_message.dart
index 4e3675ca8c9..548bcdba6ac 100644
--- a/app/lib/pages/chat/widgets/ai_message.dart
+++ b/app/lib/pages/chat/widgets/ai_message.dart
@@ -1210,6 +1210,7 @@ class _MessageActionBarState extends State<MessageActionBar> {
           _buildActionButton(
             icon: FontAwesomeIcons.share,
             onTap: () async {
+              if (widget.messageText.isEmpty) return;
               HapticFeedback.lightImpact();
               await Share.share(widget.messageText);
               PlatformManager.instance.analytics.track(
diff --git a/app/lib/pages/conversation_detail/share.dart b/app/lib/pages/conversation_detail/share.dart
index 0c8e6774808..415996e53a0 100644
--- a/app/lib/pages/conversation_detail/share.dart
+++ b/app/lib/pages/conversation_detail/share.dart
@@ -6,5 +6,6 @@ import 'package:omi/backend/schema/conversation.dart';
 
 void shareConversationLink(ServerConversation conversation, {Rect? sharePositionOrigin}) {
   final content = 'https://h.omi.me/conversations/${conversation.id}';
-  Share.share(content, subject: conversation.structured.title, sharePositionOrigin: sharePositionOrigin);
+  final subject = conversation.structured.title;
+  Share.share(content, subject: subject.isEmpty ? null : subject, sharePositionOrigin: sharePositionOrigin);
 }