diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 38312620..5925f317 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -295,7 +295,7 @@ class MessageInputState extends State<MessageInput> {
                 borderRadius: BorderRadius.circular(32),
               ),
               contentPadding: EdgeInsets.all(4),
-              prefix: Chip(
+              prefix: _giphyEnabled ? Chip(
                 backgroundColor: StreamChatTheme.of(context).accentColor,
                 label: Row(
                   children: [
@@ -304,7 +304,7 @@ class MessageInputState extends State<MessageInput> {
                     Text('GIPHY', style: TextStyle(color: Colors.white),),
                   ],
                 )
-              ),
+              ) : null,
               suffixIcon: IconButton(
                 icon: Icon(Icons.cancel_outlined),
                 onPressed: () {