diff --git a/lib/skyfall/firehose.rb b/lib/skyfall/firehose.rb
index 6266bae..3afdfe9 100644
--- a/lib/skyfall/firehose.rb
+++ b/lib/skyfall/firehose.rb
@@ -130,7 +130,7 @@ module Skyfall
 
       if @handlers[:message]
         atp_message = Firehose::Message.new(data)
-        @cursor = atp_message.cursor
+        @cursor = atp_message.cursor if atp_message.cursor
         @handlers[:message].call(atp_message)
       else
         @cursor = nil