diff --git a/src/database/entities/message.rs b/src/database/entities/message.rs
index 1d48c2d2dbae5ff077e4adf46a19229ab3f2f9d1..b506ccc3f0b2e2742adb92068c1567fe6c0d512a 100644
--- a/src/database/entities/message.rs
+++ b/src/database/entities/message.rs
@@ -119,19 +119,21 @@ impl Message {
                     })?;
             }
             Channel::Group { id, .. } => {
-                channels
-                    .update_one(
-                        doc! { "_id": id },
-                        doc! {
-                            "$set": set
-                        },
-                        None,
-                    )
-                    .await
-                    .map_err(|_| Error::DatabaseError {
-                        operation: "update_one",
-                        with: "channel",
-                    })?;
+                if let Content::Text(_) = &self.content {
+                    channels
+                        .update_one(
+                            doc! { "_id": id },
+                            doc! {
+                                "$set": set
+                            },
+                            None,
+                        )
+                        .await
+                        .map_err(|_| Error::DatabaseError {
+                            operation: "update_one",
+                            with: "channel",
+                        })?;
+                }
             }
             _ => {}
         }
@@ -140,7 +142,7 @@ impl Message {
         ClientboundNotification::Message(self)
             .publish(channel.id().to_string())
             .await
-            .ok();
+            .unwrap();
 
         /*
            Web Push Test Code