diff --git a/app/jobs/onceoff/migrate_from_slack_official.rb b/app/jobs/onceoff/migrate_from_slack_official.rb
index a8871b4..69de9ef 100644
--- a/app/jobs/onceoff/migrate_from_slack_official.rb
+++ b/app/jobs/onceoff/migrate_from_slack_official.rb
@@ -16,10 +16,12 @@ module Jobs
           ActiveRecord::Base.transaction do
             migrate_settings
             migrate_data
-            is_slack_enabled = SiteSetting.slack_enabled
+            is_slack_enabled = site_settings_value('slack_enabled')
 
             if is_slack_enabled
-              SiteSetting.slack_enabled = false
+              slack_enabled = SiteSetting.find_by(name: 'slack_enabled')
+              slack_enabled.update!(value: 'f')
+
               SiteSetting.chat_integration_slack_enabled = true
               SiteSetting.chat_integration_enabled = true
             end
@@ -75,15 +77,48 @@ module Jobs
 
     end
 
+    private
+
     def migrate_settings
-      SiteSetting.chat_integration_slack_access_token = SiteSetting.slack_access_token
-      SiteSetting.chat_integration_slack_incoming_webhook_token = SiteSetting.slack_incoming_webhook_token
-      SiteSetting.chat_integration_slack_excerpt_length = SiteSetting.slack_discourse_excerpt_length
-      SiteSetting.chat_integration_slack_outbound_webhook_url = SiteSetting.slack_outbound_webhook_url
-      SiteSetting.chat_integration_slack_icon_url = SiteSetting.slack_icon_url
-      SiteSetting.chat_integration_delay_seconds = SiteSetting.post_to_slack_window_secs
-      SiteSetting.chat_integration_discourse_username = SiteSetting.slack_discourse_username
+      if !(slack_access_token = site_settings_value('slack_access_token')).nil?
+        SiteSetting.chat_integration_slack_access_token = slack_access_token
+      end
+
+      if !(slack_incoming_webhook_token = site_settings_value('slack_incoming_webhook_token')).nil?
+        SiteSetting.chat_integration_slack_incoming_webhook_token = slack_incoming_webhook_token
+      end
+
+      if !(slack_discourse_excerpt_length = site_settings_value('slack_discourse_excerpt_length')).nil?
+        SiteSetting.chat_integration_slack_excerpt_length = slack_discourse_excerpt_length
+      end
+
+      if !(slack_outbound_webhook_url = site_settings_value('slack_outbound_webhook_url')).nil?
+        SiteSetting.chat_integration_slack_outbound_webhook_url = slack_outbound_webhook_url
+      end
+
+      if !(slack_icon_url = site_settings_value('slack_icon_url')).nil?
+        SiteSetting.chat_integration_slack_icon_url = slack_icon_url
+      end
+
+      if !(post_to_slack_window_secs = site_settings_value('post_to_slack_window_secs')).nil?
+        SiteSetting.chat_integration_delay_seconds = post_to_slack_window_secs
+      end
+
+      if !(slack_discourse_username = site_settings_value('slack_discourse_username')).nil?
+        SiteSetting.chat_integration_discourse_username = slack_discourse_username
+      end
     end
 
+    def site_settings_value(name)
+      value = SiteSetting.find_by(name: name)&.value
+
+      if value == 't'
+        value = true
+      elsif value == 'f'
+        value = false
+      end
+
+      value
+    end
   end
 end
diff --git a/spec/jobs/onceoff/migrate_from_slack_official_spec.rb b/spec/jobs/onceoff/migrate_from_slack_official_spec.rb
index d278f75..b8f6f44 100644
--- a/spec/jobs/onceoff/migrate_from_slack_official_spec.rb
+++ b/spec/jobs/onceoff/migrate_from_slack_official_spec.rb
@@ -3,6 +3,46 @@ require 'rails_helper'
 RSpec.describe Jobs::DiscourseChatMigrateFromSlackOfficial do
   let(:category) { Fabricate(:category) }
 
+  describe 'site settings' do
+    before do
+      PluginStoreRow.create!(
+        plugin_name: 'discourse-slack-official',
+        key: "category_#{category.id}",
+        type_name: "JSON",
+        value: "[{\"channel\":\"#slack-channel\",\"filter\":\"mute\"}]"
+      )
+
+      SiteSetting.create!(value: 't', data_type: 5, name: 'slack_enabled')
+      SiteSetting.create!(value: 'token', data_type: 1, name: 'slack_access_token')
+      SiteSetting.create!(value: 'token2', data_type: 1, name: 'slack_incoming_webhook_token')
+      SiteSetting.create!(value: 300, data_type: 3, name: 'slack_discourse_excerpt_length')
+      SiteSetting.create!(value: "https://hooks.slack.com/services/something", data_type: 1, name: 'slack_outbound_webhook_url')
+      SiteSetting.create!(value: "http://outbound2.com", data_type: 1, name: 'slack_icon_url')
+      SiteSetting.create!(value: 100, data_type: 3, name: 'post_to_slack_window_secs')
+      SiteSetting.create!(value: User.last.username, data_type: 1, name: 'slack_discourse_username')
+    end
+
+    it 'should migrate the site settings correctly' do
+      described_class.new.execute_onceoff({})
+
+      expect(SiteSetting.find_by(name: 'slack_enabled').value).to eq('f')
+      expect(SiteSetting.chat_integration_slack_access_token).to eq('token')
+      expect(SiteSetting.chat_integration_slack_incoming_webhook_token).to eq('token2')
+      expect(SiteSetting.chat_integration_slack_excerpt_length).to eq(300)
+
+      expect(SiteSetting.chat_integration_slack_outbound_webhook_url)
+        .to eq("https://hooks.slack.com/services/something")
+
+      expect(SiteSetting.chat_integration_slack_icon_url)
+        .to eq("http://outbound2.com")
+
+      expect(SiteSetting.chat_integration_delay_seconds).to eq(100)
+      expect(SiteSetting.chat_integration_discourse_username).to eq(User.last.username)
+      expect(SiteSetting.chat_integration_slack_enabled).to eq(true)
+      expect(SiteSetting.chat_integration_enabled).to eq(true)
+    end
+  end
+
   describe 'when a uncategorized filter is present' do
     before do
       PluginStoreRow.create!(