diff --git a/src/server.h b/src/server.h
index d251fa026..f2c93241c 100644
--- a/src/server.h
+++ b/src/server.h
@@ -239,7 +239,7 @@ typedef long long ustime_t; /* microsecond time type. */
                                           we return single threaded that the
                                           client has already pending commands
                                           to be executed. */
-#define CLIENT_TRACKING (1<<31) /* Client enabled keys tracking in order to
+#define CLIENT_TRACKING (1ULL<<31) /* Client enabled keys tracking in order to
                                    perform client side caching. */
 #define CLIENT_TRACKING_BROKEN_REDIR (1ULL<<32) /* Target client is invalid. */
 
diff --git a/src/tracking.c b/src/tracking.c
index f7f0fc755..acb97800a 100644
--- a/src/tracking.c
+++ b/src/tracking.c
@@ -164,7 +164,7 @@ void trackingInvalidateSlot(uint64_t slot) {
     raxSeek(&ri,"^",NULL,0);
     while(raxNext(&ri)) {
         uint64_t id;
-        memcpy(&id,ri.key,ri.key_len);
+        memcpy(&id,ri.key,sizeof(id));
         client *c = lookupClientByID(id);
         if (c == NULL || !(c->flags & CLIENT_TRACKING)) continue;
         sendTrackingMessage(c,slot);