diff --git a/src/codegen/cli/commands/claude/config/claude_session_hook.py b/src/codegen/cli/commands/claude/config/claude_session_hook.py
index 2f14f1542..c5021de9e 100755
--- a/src/codegen/cli/commands/claude/config/claude_session_hook.py
+++ b/src/codegen/cli/commands/claude/config/claude_session_hook.py
@@ -11,8 +11,6 @@
 import sys
 from pathlib import Path
 
-from codegen.cli.utils.org import resolve_org_id
-
 # Add the codegen CLI to the path so we can import from it
 script_dir = Path(__file__).parent
 codegen_cli_dir = script_dir.parent.parent.parent
@@ -20,6 +18,7 @@
 
 try:
     from codegen.cli.commands.claude.claude_session_api import create_claude_session
+    from codegen.cli.utils.org import resolve_org_id
 except ImportError:
     create_claude_session = None