diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarker.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarker.java
index cdce44625..9f8f93c3d 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarker.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarker.java
@@ -19,7 +19,6 @@ package org.jivesoftware.smackx.chat_markers.filter;
 import org.jivesoftware.smack.filter.StanzaExtensionFilter;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Stanza;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.chatstates.ChatState;
 import org.jivesoftware.smackx.chatstates.ChatStateManager;
 
@@ -51,7 +50,7 @@ public final class EligibleForChatMarker extends StanzaExtensionFilter {
      */
     @Override
     public boolean accept(Stanza message) {
-        if (StringUtils.isNullOrEmpty(message.getStanzaId())) {
+        if (!message.hasStanzaIdSet()) {
             return false;
         }