diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index 50b674f..f3683b3 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -212,12 +212,14 @@ function Map({
         return bWeight - aWeight;
       } else if (
         draggingTokenOptions &&
+        draggingTokenOptions.dragging &&
         draggingTokenOptions.tokenState.id === a.id
       ) {
         // If dragging token a move above
         return 1;
       } else if (
         draggingTokenOptions &&
+        draggingTokenOptions.dragging &&
         draggingTokenOptions.tokenState.id === b.id
       ) {
         // If dragging token b move above