diff --git a/chatterino.pro b/chatterino.pro
index 56228b399..69f009af6 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -69,6 +69,8 @@ macx {
 CONFIG(debug, debug|release) {
     DEFINES += C_DEBUG
     DEFINES += QT_DEBUG
+} else {
+    DEFINES += NDEBUG
 }
 
 # Submodules
diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp
index dc1b1ab3c..ffef47e91 100644
--- a/src/providers/ffz/FfzEmotes.cpp
+++ b/src/providers/ffz/FfzEmotes.cpp
@@ -14,7 +14,7 @@ namespace {
     Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
     {
         auto emote = urls.value(emoteScale);
-        if (emote.isUndefined())
+        if (emote.isUndefined() || emote.isNull())
         {
             return {""};
         }