diff --git a/src/components/app/MemberTemplate.vue b/src/components/app/MemberTemplate.vue
index 6cb66e3..7fb4f50 100644
--- a/src/components/app/MemberTemplate.vue
+++ b/src/components/app/MemberTemplate.vue
@@ -60,10 +60,16 @@ export default {
       if (!this.roles) return undefined;
 
       let filter = this.roles.filter(r => this.member.roles.includes(r.id));
-      if (!filter.length) {
-        filter = [this.roles.find(r => r.default)];
+
+      if (filter.length) {
+        if (filter[0].color) {
+          return filter[0].color + " !important";
+        } else {
+          return undefined;
+        }
+      } else {
+        return this.roles.find(r => r.default).color + " !important";
       }
-      return filter[0].color + " !important";
     },
     isAdmin() {
       if (!this.roles) return false;
diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue
index 972aba9..c6ec791 100644
--- a/src/components/app/MessageTemplate.vue
+++ b/src/components/app/MessageTemplate.vue
@@ -337,11 +337,19 @@ export default {
     roleColor() {
       if (!this.isServer) return undefined;
       if (!this.serverMember || !this.serverMember.roles) return undefined;
-      const filtered = this.roles.filter(r =>
+
+      const filter = this.roles.filter(r =>
         this.serverMember.roles.includes(r.id)
       );
-      if (!filtered.length) return undefined;
-      return filtered[0].color + " !important";
+      if (filter.length) {
+        if (filter[0].color) {
+          return filter[0].color + " !important";
+        } else {
+          return undefined;
+        }
+      } else {
+        return this.roles.find(r => r.default).color + " !important";
+      }
     }
   }
 };