diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart
index e54f3f1..37d56bb 100644
--- a/lib/screens/channels_screen.dart
+++ b/lib/screens/channels_screen.dart
@@ -1046,10 +1046,11 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                                 if (hashtag.startsWith('#')) {
                                   hashtag = hashtag.substring(1);
                                 }
-                                final channelName = '#$hashtag';
-
+                                final String channelName;
+                                
                                 final Uint8List psk;
                                 if (isRegularHashtag) {
+                                  channelName = '#$hashtag';
                                   // Regular hashtag - public derivation using SHA256
                                   psk = Channel.derivePskFromHashtag(hashtag);
                                 } else {
@@ -1068,8 +1069,8 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                                     );
                                     return;
                                   }
-                                  psk = selectedCommunity!
-                                      .deriveCommunityHashtagPsk(hashtag);
+                                  channelName = '${selectedCommunity!.name} #$hashtag';
+                                  psk = selectedCommunity!.deriveCommunityHashtagPsk(hashtag);
                                   // Track in community's hashtag list
                                   await _communityStore.addHashtagChannel(
                                     selectedCommunity!.id,