diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index dc66d2fb40e..5c53ea52912 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -17,6 +17,8 @@ class ApiKey < ActiveRecord::Base
           where(key_hash: hashed)
         }
 
+  validates :description, length: { maximum: 255 }
+
   after_initialize :generate_key
 
   def generate_key
diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb
index 330b4b103cb..caf5c16e9dc 100644
--- a/spec/models/api_key_spec.rb
+++ b/spec/models/api_key_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe ApiKey do
 
   it { is_expected.to belong_to :user }
   it { is_expected.to belong_to :created_by }
+  it { is_expected.to validate_length_of(:description).is_at_most(255) }
 
   it "generates a key when saving" do
     api_key = ApiKey.new