diff --git a/app/models/user.rb b/app/models/user.rb
index 7885f29decf..1eaa587daef 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
 class User < ApplicationRecord
-  self.ignored_columns = %w[totp_timestamp email_fingerprint encrypted_email]
+  self.ignored_columns = %w[totp_timestamp]
   include NonNullUuid
 
   include ::NewRelic::Agent::MethodTracer
diff --git a/db/primary_migrate/20220621170346_drop_users_email_columns.rb b/db/primary_migrate/20220621170346_drop_users_email_columns.rb
new file mode 100644
index 00000000000..e992c4b96a4
--- /dev/null
+++ b/db/primary_migrate/20220621170346_drop_users_email_columns.rb
@@ -0,0 +1,8 @@
+class DropUsersEmailColumns < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      remove_column :users, :encrypted_email, type: :text, default: '', null: false
+      remove_column :users, :email_fingerprint, type: :text, default: '', null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4b87af6842c..dff44e90244 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_06_13_174442) do
+ActiveRecord::Schema.define(version: 2022_06_21_170346) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -576,8 +576,6 @@
     t.string "direct_otp"
     t.datetime "direct_otp_sent_at"
     t.string "unique_session_id"
-    t.string "email_fingerprint", default: "", null: false
-    t.text "encrypted_email", default: "", null: false
     t.text "encrypted_phone"
     t.integer "otp_delivery_preference", default: 0, null: false
     t.integer "totp_timestamp"