diff --git a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
index fb3fb6179e..2c17fd2adc 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
@@ -2244,7 +2244,9 @@ public GuildWelcomeScreen createWelcomeScreen(Guild guild, DataObject object)
         for (int i = 0; i < welcomeChannelsArray.length(); i++)
         {
             final DataObject welcomeChannelObj = welcomeChannelsArray.getObject(i);
-            final EmojiUnion emoji = createEmoji(welcomeChannelObj, "emoji_name", "emoji_id");
+            EmojiUnion emoji = null;
+            if (!welcomeChannelObj.isNull("emoji_id") || !welcomeChannelObj.isNull("emoji_name"))
+                emoji = createEmoji(welcomeChannelObj, "emoji_name", "emoji_id");
 
             welcomeChannels.add(new GuildWelcomeScreenImpl.ChannelImpl(
                     guild,