diff --git a/db/migrate/20140522003151_add_user_avatars.rb b/db/migrate/20140522003151_add_user_avatars.rb
index 4d96a1b05..cb9a51348 100644
--- a/db/migrate/20140522003151_add_user_avatars.rb
+++ b/db/migrate/20140522003151_add_user_avatars.rb
@@ -16,6 +16,13 @@ class AddUserAvatars < ActiveRecord::Migration
    SELECT id, uploaded_avatar_id
    FROM users
 SQL
+
+    execute <<SQL
+    UPDATE users SET uploaded_avatar_id = NULL
+    WHERE NOT use_uploaded_avatar
+SQL
+
+    # NOTE we should nuke use_uploaded_avatar later on
   end
 
   def down