diff --git a/disco/state.py b/disco/state.py
index 8326edf..439ab85 100644
--- a/disco/state.py
+++ b/disco/state.py
@@ -24,6 +24,7 @@ class State(object):
         self.guilds = {}
         self.channels = WeakValueDictionary()
         self.users = WeakValueDictionary()
+        self.voice_states = WeakValueDictionary()
 
         self.client.events.on('Ready', self.on_ready)
 
@@ -42,6 +43,9 @@ class State(object):
         self.client.events.on('ChannelUpdate', self.on_channel_update)
         self.client.events.on('ChannelDelete', self.on_channel_delete)
 
+        # Voice states
+        self.client.events.on('VoiceStateUpdate', self.on_voice_state_update)
+
     def on_ready(self, event):
         self.me = event.user
 
@@ -101,3 +105,15 @@ class State(object):
             del self.guilds[event.channel.id]
         elif event.channel.is_dm:
             del self.pms[event.channel.id]
+
+    def on_voice_state_update(self, event):
+        # Happy path: we have the voice state and want to update/delete it
+        guild = self.guilds.get(event.state.guild_id)
+
+        if event.state.session_id in guild.voice_states:
+            if event.state.channel_id:
+                guild.voice_states[event.state.session_id].update(event.state)
+            else:
+                del guild.voice_states[event.state.session_id]
+        elif event.state.channel_id:
+            guild.voice_states[event.state.session_id] = event.state
diff --git a/disco/types/base.py b/disco/types/base.py
index 6e945eb..28efe7f 100644
--- a/disco/types/base.py
+++ b/disco/types/base.py
@@ -9,7 +9,10 @@ class BaseType(skema.Model):
         pass
 
     def update(self, other):
-        self.__dict__.update(other.__dict__)
+        for name, field in other.__class__._fields.items():
+            value = getattr(other, name)
+            if value:
+                setattr(self, name, value)
 
     @classmethod
     def create(cls, client, data):