diff --git a/server/Lib.cs b/server/Lib.cs
index 19f8d61..735a59e 100644
--- a/server/Lib.cs
+++ b/server/Lib.cs
@@ -1,3 +1,4 @@
+using System.Text.RegularExpressions;
 using SpacetimeDB;
 
 public static partial class Module
@@ -60,9 +61,10 @@ public static partial class Module
 
     private static string ValidateColor(string color)
     {
-        if (color[0] == '#' && color.Length != 4 || color.Length != 7)
+        var regex = new Regex("^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$");
+        if (regex.IsMatch(color))
         {
-            throw new Exception("Invalid Hex color code");
+            throw new Exception("Invalid color code");
         }
         return color;
     }