diff --git a/db/migrate/20120101000010_create_ticket.rb b/db/migrate/20120101000010_create_ticket.rb
index 3cde4a7fa..bf3a9f801 100644
--- a/db/migrate/20120101000010_create_ticket.rb
+++ b/db/migrate/20120101000010_create_ticket.rb
@@ -342,7 +342,7 @@ class CreateTicket < ActiveRecord::Migration
     create_table :channels do |t|
       t.references :group,                             null: true
       t.column :area,           :string, limit: 100,   null: false
-      t.column :options,        :string, limit: 2000,  null: true
+      t.column :options,        :string, limit: 500.kilobytes + 1,  null: true
       t.column :active,         :boolean,              null: false, default: true
       t.column :preferences,    :string, limit: 2000, null: true
       t.column :last_log_in,    :text,   limit: 500.kilobytes + 1, null: true
diff --git a/db/migrate/20160718000001_update_channel.rb b/db/migrate/20160718000001_update_channel.rb
new file mode 100644
index 000000000..382c4bb64
--- /dev/null
+++ b/db/migrate/20160718000001_update_channel.rb
@@ -0,0 +1,9 @@
+
+class UpdateChannel < ActiveRecord::Migration
+  def up
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    change_column :channels, :options, :string, limit: 500.kilobytes + 1,  null: true
+  end
+end