diff --git a/src/components/chats/chat/ChatMessages.vue b/src/components/chats/chat/ChatMessages.vue
index 6d6d4c07..a115e519 100644
--- a/src/components/chats/chat/ChatMessages.vue
+++ b/src/components/chats/chat/ChatMessages.vue
@@ -38,7 +38,7 @@
 
           <template v-else>
             <unnnic-chats-message
-              v-if="message.text"
+              v-if="message.text || isGeolocation(message.media[0])"
               :type="message.user || isMessageByBot(message) ? 'sent' : 'received'"
               :class="[
                 'chat-messages__message',
@@ -49,7 +49,7 @@
               :key="message.uuid"
               :ref="`message-${message.uuid}`"
             >
-              {{ isGeolocation(message.media[0]) ? message.media[0].url : message.text }}
+              {{ isGeolocation(message.media[0]) ? message.media[0]?.url : message.text }}
             </unnnic-chats-message>
             <template v-for="media in message.media">
               <unnnic-chats-message
@@ -86,7 +86,7 @@
                 />
               </unnnic-chats-message>
               <unnnic-chats-message
-                v-else-if="!isMedia(media)"
+                v-else-if="!isGeolocation(media)"
                 :key="media.created_on"
                 :ref="`message-${message.uuid}`"
                 :type="message.user ? 'sent' : 'received'"
@@ -115,9 +115,9 @@
 
     <!-- Media fullscreen -->
     <fullscreen-preview
-      v-if="isFullscreen"
-      :downloadMediaUrl="currentMedia.url"
-      :downloadMediaName="currentMedia.message"
+      v-if="isFullscreen && currentMedia"
+      :downloadMediaUrl="currentMedia?.url"
+      :downloadMediaName="currentMedia?.message"
       @close="isFullscreen = false"
       @next="nextMedia"
       @previous="previousMedia"
@@ -210,10 +210,7 @@ export default {
       return this.roomMessages
         .map((el) => el.media)
         .flat()
-        .filter((el) => {
-          const media = /(png|jp(e)?g|webp|mp4)/;
-          return media.test(el.content_type);
-        });
+        .filter((media) => this.isMedia(media));
     },
   },
 
@@ -236,11 +233,14 @@ export default {
       return this.isMediaOfType(media, 'audio');
     },
     isGeolocation(media) {
-      return this.isMediaOfType(media, 'geo');
+      if (media) {
+        return this.isMediaOfType(media, 'geo');
+      }
+      return false;
     },
     isMedia(media) {
-      const { isAudio, isImage, isVideo, isGeolocation } = this;
-      return isAudio(media) || isImage(media) || isVideo(media) || isGeolocation(media);
+      const { isAudio, isImage, isVideo } = this;
+      return isAudio(media) || isImage(media) || isVideo(media);
     },
     messageStatus({ message, media }) {
       if (message) {
diff --git a/src/store/modules/roomMessages.js b/src/store/modules/roomMessages.js
index b800cbf3..d700207d 100644
--- a/src/store/modules/roomMessages.js
+++ b/src/store/modules/roomMessages.js
@@ -210,6 +210,7 @@ export default {
           const response = await Message.getByRoom({ nextReq }, activeRoom.uuid, offset, limit);
 
           const { results: messages, next: hasNext } = response;
+          let newMessages = messages;
 
           if (!messages?.[0] || !activeRoom?.uuid || messages?.[0]?.room !== activeRoom.uuid) {
             return;
@@ -222,6 +223,8 @@ export default {
                 addBefore: !!nextReq || concat,
               });
             });
+
+            newMessages = newMessages.concat(state.roomMessages);
           } else {
             commit(mutations.RESET_ROOM_MESSAGES_SORTED);
             messages.forEach((message) => {
@@ -229,7 +232,7 @@ export default {
             });
           }
 
-          commit(mutations.SET_ROOM_MESSAGES, messages);
+          commit(mutations.SET_ROOM_MESSAGES, newMessages);
           commit(mutations.SET_ROOM_MESSAGES_NEXT, hasNext);
         } catch (error) {
           console.error('An error ocurred when try get the room messages', error);