diff --git a/src/api/dashboard/routes.py b/src/api/dashboard/routes.py
index 21c7e7d..b79d871 100644
--- a/src/api/dashboard/routes.py
+++ b/src/api/dashboard/routes.py
@@ -200,7 +200,8 @@ async def get_guild_roles(guild_id: int, user: dict = Depends(get_current_user))
 
     roles = [
         {"id": str(r.id), "name": r.name, "color": str(r.color)}
-        for r in guild.roles if not r.is_default() and not r.managed
+        for r in guild.roles
+        if not r.is_default() and not r.managed
     ]
     return {"roles": roles}
 
@@ -397,7 +398,11 @@ async def get_mega_data(guild_id: int, user: dict = Depends(get_current_user)):
 
         # 3. Fetch Metadata
         channels = [{"id": str(c.id), "name": c.name} for c in guild.text_channels]
-        roles = [{"id": str(r.id), "name": r.name, "color": str(r.color)} for r in guild.roles if not r.is_default() and not r.managed]
+        roles = [
+            {"id": str(r.id), "name": r.name, "color": str(r.color)}
+            for r in guild.roles
+            if not r.is_default() and not r.managed
+        ]
         categories = [{"id": str(c.id), "name": c.name} for c in guild.categories]
         voice_channels = [{"id": str(c.id), "name": c.name} for c in guild.voice_channels]
 
diff --git a/src/web/components/ui/SearchableSelect.tsx b/src/web/components/ui/SearchableSelect.tsx
index 3643fc8..052c5c3 100644
--- a/src/web/components/ui/SearchableSelect.tsx
+++ b/src/web/components/ui/SearchableSelect.tsx
@@ -67,7 +67,7 @@ export function SearchableSelect({
                                 {type === "role" && (
                                     <div
                                         className="w-3 h-3 rounded-full shrink-0"
-                                        style={{ backgroundColor: selectedOption.color || "#99aab5" }}
+                                        style={{ backgroundColor: (selectedOption.color && selectedOption.color !== "#000000") ? selectedOption.color : "#99aab5" }}
                                     />
                                 )}
                                 <span className="truncate">{selectedOption.name}</span>
@@ -107,7 +107,7 @@ export function SearchableSelect({
                                     {type === "role" && (
                                         <div
                                             className="w-3 h-3 rounded-full shrink-0"
-                                            style={{ backgroundColor: option.color || "#99aab5" }}
+                                            style={{ backgroundColor: (option.color && option.color !== "#000000") ? option.color : "#99aab5" }}
                                         />
                                     )}
                                     <span className="truncate flex-1 text-white/90">{option.name}</span>