diff --git a/migrations/2025-06-06-145916_guild_ownership_changes/down.sql b/migrations/2025-06-06-145916_guild_ownership_changes/down.sql
new file mode 100644
index 0000000..21a08c9
--- /dev/null
+++ b/migrations/2025-06-06-145916_guild_ownership_changes/down.sql
@@ -0,0 +1,14 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE guilds
+ADD COLUMN owner_uuid UUID REFERENCES users(uuid);
+
+UPDATE guilds g
+SET owner_uuid = gm.user_uuid
+FROM guild_members gm
+WHERE gm.guild_uuid = g.uuid AND gm.is_owner = TRUE;
+
+ALTER TABLE guilds
+ALTER COLUMN owner_uuid SET NOT NULL;
+
+ALTER TABLE guild_members
+DROP COLUMN is_owner;
diff --git a/migrations/2025-06-06-145916_guild_ownership_changes/up.sql b/migrations/2025-06-06-145916_guild_ownership_changes/up.sql
new file mode 100644
index 0000000..b94323f
--- /dev/null
+++ b/migrations/2025-06-06-145916_guild_ownership_changes/up.sql
@@ -0,0 +1,14 @@
+-- Your SQL goes here
+ALTER TABLE guild_members
+ADD COLUMN is_owner BOOLEAN NOT NULL DEFAULT false;
+
+UPDATE guild_members gm
+SET is_owner = true
+FROM guilds g
+WHERE gm.guild_uuid = g.uuid AND gm.user_uuid = g.owner_uuid;
+
+CREATE UNIQUE INDEX one_owner_per_guild ON guild_members (guild_uuid)
+WHERE is_owner;
+
+ALTER TABLE guilds
+DROP COLUMN owner_uuid;
diff --git a/src/objects/guild.rs b/src/objects/guild.rs
index f5e973d..7d55595 100644
--- a/src/objects/guild.rs
+++ b/src/objects/guild.rs
@@ -26,7 +26,6 @@ pub struct GuildBuilder {
     name: String,
     description: Option<String>,
     icon: Option<String>,
-    owner_uuid: Uuid,
 }
 
 impl GuildBuilder {
@@ -40,7 +39,6 @@ impl GuildBuilder {
             name: self.name,
             description: self.description,
             icon: self.icon.and_then(|i| i.parse().ok()),
-            owner_uuid: self.owner_uuid,
             roles,
             member_count,
         })
@@ -53,7 +51,6 @@ pub struct Guild {
     name: String,
     description: Option<String>,
     icon: Option<Url>,
-    owner_uuid: Uuid,
     pub roles: Vec<Role>,
     member_count: i64,
 }
@@ -110,7 +107,6 @@ impl Guild {
             name: name.clone(),
             description: None,
             icon: None,
-            owner_uuid,
         };
 
         insert_into(guilds::table)
@@ -125,6 +121,7 @@ impl Guild {
             nickname: None,
             user_uuid: owner_uuid,
             guild_uuid,
+            is_owner: true,
         };
 
         insert_into(guild_members::table)
@@ -137,7 +134,6 @@ impl Guild {
             name,
             description: None,
             icon: None,
-            owner_uuid,
             roles: vec![],
             member_count: 1,
         })
diff --git a/src/objects/member.rs b/src/objects/member.rs
index f18e726..67312e4 100644
--- a/src/objects/member.rs
+++ b/src/objects/member.rs
@@ -17,6 +17,7 @@ pub struct MemberBuilder {
     pub nickname: Option<String>,
     pub user_uuid: Uuid,
     pub guild_uuid: Uuid,
+    pub is_owner: bool,
 }
 
 impl MemberBuilder {
@@ -28,6 +29,7 @@ impl MemberBuilder {
             nickname: self.nickname.clone(),
             user_uuid: self.user_uuid,
             guild_uuid: self.guild_uuid,
+            is_owner: self.is_owner,
             user,
         })
     }
@@ -39,6 +41,7 @@ pub struct Member {
     pub nickname: Option<String>,
     pub user_uuid: Uuid,
     pub guild_uuid: Uuid,
+    pub is_owner: bool,
     user: User,
 }
 
@@ -113,6 +116,7 @@ impl Member {
             guild_uuid,
             user_uuid,
             nickname: None,
+            is_owner: false,
         };
 
         insert_into(guild_members::table)
diff --git a/src/schema.rs b/src/schema.rs
index aaef9c1..c7a350c 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -38,13 +38,13 @@ diesel::table! {
         user_uuid -> Uuid,
         #[max_length = 100]
         nickname -> Nullable<Varchar>,
+        is_owner -> Bool,
     }
 }
 
 diesel::table! {
     guilds (uuid) {
         uuid -> Uuid,
-        owner_uuid -> Uuid,
         #[max_length = 100]
         name -> Varchar,
         #[max_length = 300]
@@ -139,7 +139,6 @@ diesel::joinable!(channel_permissions -> channels (channel_uuid));
 diesel::joinable!(channels -> guilds (guild_uuid));
 diesel::joinable!(guild_members -> guilds (guild_uuid));
 diesel::joinable!(guild_members -> users (user_uuid));
-diesel::joinable!(guilds -> users (owner_uuid));
 diesel::joinable!(instance_permissions -> users (uuid));
 diesel::joinable!(invites -> guilds (guild_uuid));
 diesel::joinable!(invites -> users (user_uuid));