1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/org/traccar/protocol/EelinkProtocolDecoder.java
index 009baebd0..e63189dae 100644
--- a/src/org/traccar/protocol/EelinkProtocolDecoder.java
+++ b/src/org/traccar/protocol/EelinkProtocolDecoder.java
@@ -99,10 +99,11 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
             }
         }
         
-        else if (type == MSG_GPS ||
+        else if (deviceId != null &&
+                (type == MSG_GPS ||
                  type == MSG_ALARM ||
                  type == MSG_STATE ||
-                 type == MSG_SMS) {
+                 type == MSG_SMS)) {
             
             // Create new position
             Position position = new Position();