diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart
index 336b988..cfa210e 100644
--- a/lib/widgets/composer/composer.dart
+++ b/lib/widgets/composer/composer.dart
@@ -16,7 +16,6 @@ import "package:nexus/models/relation_type.dart";
 import "package:nexus/widgets/composer/mention_overlay.dart";
 import "package:nexus/widgets/composer/relation_preview.dart";
 import "package:nexus/main.dart";
-import "package:nexus/widgets/emoji_picker.dart";
 
 class const Composer(
   final String roomId, {
@@ -120,16 +119,9 @@ class const Composer(
                         )
                         ? [
                             IconButton(
-                              onPressed: () => showModalBottomSheet(
-                                isScrollControlled: true,
-                                context: context,
-                                builder: (context) => EmojiPicker(
-                                  onSelection: (value) {
-                                    controller.value.text += value;
-                                    node?.requestFocus();
-                                  },
-                                ),
-                              ),
+                              onPressed: () {
+                                //TODO onSelection: (_) => node?.requestFocus(),
+                              },
                               icon: Icon(Icons.emoji_emotions),
                             ),
                             PopupMenuButton(
diff --git a/lib/widgets/room_chat.dart b/lib/widgets/room_chat.dart
index 8db1dcd..a6d29d3 100644
--- a/lib/widgets/room_chat.dart
+++ b/lib/widgets/room_chat.dart
@@ -238,7 +238,7 @@ final class const RoomChat({
                     icon: Icon(Icons.emoji_emotions),
 
                     onPressed: () {
-                      // TODO: More adaptive, e.g. dialog on desktop
+                      // TODO: More adaptive
                       Navigator.of(context).pop();
                       showModalBottomSheet(
                         isScrollControlled: true,