diff --git a/components/canvas/shape.tsx b/components/canvas/shape.tsx
index 08fbbd62b..7a7dfa437 100644
--- a/components/canvas/shape.tsx
+++ b/components/canvas/shape.tsx
@@ -68,7 +68,7 @@ function Shape({ id, isSelecting, parentPoint }: ShapeProps): JSX.Element {
       device={isMobileDevice ? 'mobile' : 'desktop'}
       {...events}
     >
-      {!isShy && (
+      {isSelecting && !isShy && (
         <>
           {isForeignObject ? (
             <HoverIndicator
diff --git a/state/session.ts b/state/session.ts
index 5cf13a5f1..0e8397500 100644
--- a/state/session.ts
+++ b/state/session.ts
@@ -71,11 +71,7 @@ class SessionManager {
    * ```
    */
   complete<T extends BaseSession>(...args: Parameters<T['complete']>) {
-    const session = this.#current
-
-    if (session === undefined) return this
-
-    session.complete.call(this.#current, ...args)
+    this.#current?.complete.call(this.#current, ...args)
     this.#current = undefined
     return this
   }
@@ -89,7 +85,7 @@ class SessionManager {
    * ```
    */
   cancel<T extends BaseSession>(...args: Parameters<T['cancel']>) {
-    this.#current.cancel.call(this.#current, ...args)
+    this.#current?.cancel.call(this.#current, ...args)
     this.#current = undefined
     return this
   }