diff --git a/app/models/status_reaction.rb b/app/models/status_reaction.rb
index 9597423772..a54d03a309 100644
--- a/app/models/status_reaction.rb
+++ b/app/models/status_reaction.rb
@@ -27,6 +27,6 @@ class StatusReaction < ApplicationRecord
   private
 
   def set_custom_emoji
-    self.custom_emoji = CustomEmoji.find_by(disabled: false, shortcode: name, domain: account.domain) if name.present?
+    self.custom_emoji = CustomEmoji.find_by(shortcode: name, domain: account.domain) if name.blank?
   end
 end
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 9cd7cd0af1..688afde716 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.1.2'
+      '+1.1.3'
     end
 
     def to_a