diff --git a/app/components/dm/DmNewMessageDialog.vue b/app/components/dm/DmNewMessageDialog.vue
index 87cca660..af58b325 100644
--- a/app/components/dm/DmNewMessageDialog.vue
+++ b/app/components/dm/DmNewMessageDialog.vue
@@ -11,6 +11,11 @@ const selectedUsername = ref<string | null>(null);
 const open = defineModel<boolean>('open', { default: false });
 
 const { users, loading } = useSearchUsers(search);
+const userStore = useUserStore();
+const currentUsername = computed(() => userStore.user?.username);
+const filteredUsers = computed(() => {
+  return users.value?.filter((u) => u.username !== currentUsername.value) || [];
+});
 const router = useRouter();
 const { startConversation, isStarting } = useStartConversation();
 
@@ -65,7 +70,6 @@ async function onNewConversation() {
         <UiDialogDescription class="sr-only">
           {{ $t('dm.dialog.search-people') }}
         </UiDialogDescription>
-        <!-- Search input -->
         <div class="px-4 pt-3 pb-2">
           <label class="sr-only" :for="'dm-search'">{{ $t('dm.dialog.search-people') }}</label>
           <div class="bg-muted/20 flex items-center gap-2 rounded-xl px-3 py-2">
@@ -91,7 +95,7 @@ async function onNewConversation() {
 
         <div v-else>
           <div
-            v-for="u in users || []"
+            v-for="u in filteredUsers || []"
             :key="u.username"
             class="flex items-center gap-3 px-4 py-3"
             :class="{
diff --git a/app/composables/useDmConversations.ts b/app/composables/useDmConversations.ts
index 4ac17e08..975d9ce1 100644
--- a/app/composables/useDmConversations.ts
+++ b/app/composables/useDmConversations.ts
@@ -101,8 +101,10 @@ export function useDmConversations() {
     const list = [...allConversations.value];
 
     list.sort((a, b) => {
-      const aTime = a.lastMessage?.sentAt ? new Date(a.lastMessage.sentAt).getTime() : 0;
-      const bTime = b.lastMessage?.sentAt ? new Date(b.lastMessage.sentAt).getTime() : 0;
+      const aTime = a.lastMessage?.sentAt ? new Date(a.lastMessage.sentAt).getTime() : Infinity;
+
+      const bTime = b.lastMessage?.sentAt ? new Date(b.lastMessage.sentAt).getTime() : Infinity;
+
       return bTime - aTime;
     });
 
diff --git a/test/nuxt/composables/useDmConversations.spec.ts b/test/nuxt/composables/useDmConversations.spec.ts
index cfd39e54..6ee1d708 100644
--- a/test/nuxt/composables/useDmConversations.spec.ts
+++ b/test/nuxt/composables/useDmConversations.spec.ts
@@ -294,7 +294,7 @@ describe('useDmConversations', () => {
       } as any);
 
       const { conversations } = useDmConversations();
-      expect(conversations.value[0].id).toBe('c2');
+      expect(conversations.value[0].id).toBe('c1');
     });
   });
 });