diff --git a/src/client/interfaces/Infraction.ts b/src/client/interfaces/Infraction.ts
index ad39b90..295d858 100644
--- a/src/client/interfaces/Infraction.ts
+++ b/src/client/interfaces/Infraction.ts
@@ -264,13 +264,13 @@ class Infraction
             }
         }
 
-        if (this.#duration)
-            await this.#client.moderation.handleTimedInfraction(this.json);
-
-        /* LMAOOOO PLEASE DONT JUDGE ME */
+        // Remove the role structures as they will cause problems when serialising for database
         if (this.#data.roles)
             delete this.#data.roles;
 
+        if (this.#duration)
+            await this.#client.moderation.handleTimedInfraction(this.json);
+
         return this.save();
     }