diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index dbe63a66b..79a4bbc8b 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -10,7 +10,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
     @message_template = MessageTemplate::CustomTip.new
   end
 
-  def create 
+  def create
     @message_template = MessageTemplate::CustomTip.new(message_template_params)
 
     if @message_template.save!
@@ -47,7 +47,8 @@ class Admins::MessageTemplatesController < Admins::BaseController
 
   private 
   def message_template_params
-    params.require(@message_template.type.split("::").join("_").underscore.to_sym).permit!
+    type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip"
+    params.require(type.split("::").join("_").underscore.to_sym).permit!
   end
 
   def get_template
diff --git a/app/models/message_template.rb b/app/models/message_template.rb
index 50de7d8ef..ec761ddcf 100644
--- a/app/models/message_template.rb
+++ b/app/models/message_template.rb
@@ -13,6 +13,7 @@
 #
 
 class MessageTemplate < ApplicationRecord
+  self.inheritance_column = nil
   PLATFORM = 'GitLink'
 
   def self.build_init_data