diff --git a/src/views/SQSView.vue b/src/views/SQSView.vue
index 3d3b996..6214512 100644
--- a/src/views/SQSView.vue
+++ b/src/views/SQSView.vue
@@ -85,7 +85,8 @@
             </v-chip>
             <div class="text-caption text-grey mt-2">
               Delay: {{ queue.attributes.DelaySeconds || 0 }}s • 
-              Visibility: {{ queue.attributes.VisibilityTimeoutSeconds || 30 }}s
+              Visibility: {{ queue.attributes.VisibilityTimeoutSeconds || 30 }}s •
+              Fifo: {{ queue?.attributes?.FifoQueue ? 'Sim' : 'Não' }}
             </div>
           </v-card-text>
         </v-card>
@@ -239,6 +240,7 @@
           ></v-textarea>
           
           <v-text-field
+            v-if="!isCurrentQueueFifo()"
             v-model.number="newMessage.delaySeconds"
             label="Delay (segundos)"
             type="number"
@@ -246,6 +248,14 @@
             max="900"
             class="mt-3"
           ></v-text-field>
+
+          <v-text-field
+            v-if="isCurrentQueueFifo()"
+            v-model="newMessage.messageGroupId"
+            label="ID do Grupo de Mensagens"
+            class="mt-3"
+            required
+          ></v-text-field>
         </v-card-text>
         <v-card-actions>
           <v-spacer></v-spacer>
@@ -305,7 +315,8 @@ const newQueue = ref({
 
 const newMessage = ref({
   body: '',
-  delaySeconds: 0
+  delaySeconds: 0,
+  messageGroupId: ''
 })
 
 const queueNameRules = [
@@ -444,12 +455,15 @@ const receiveMessages = async () => {
 const sendMessage = async () => {
   if (!newMessage.value.body || !currentQueue.value) return
   
+  const isFifo = isCurrentQueueFifo()
+  
   sending.value = true
   try {
     const params = {
       QueueUrl: currentQueue.value.url,
       MessageBody: newMessage.value.body,
-      DelaySeconds: newMessage.value.delaySeconds
+      DelaySeconds: isFifo ? undefined: newMessage.value.delaySeconds,
+      MessageGroupId: isFifo ? newMessage.value.messageGroupId : undefined    
     }
     
     await sqs.value.send(new SendMessageCommand(params))
@@ -491,6 +505,10 @@ const parseAndFormatDate = (timestamp) => {
   return formatDate(parseInt(timestamp))
 }
 
+const isCurrentQueueFifo = () => {
+  return currentQueue.value?.attributes?.FifoQueue === 'true'
+}
+
 onMounted(() => {
   loadQueues()
 })