diff --git a/semantic_router/encoders/openai.py b/semantic_router/encoders/openai.py
index 24439bf6ac01fe71fff853186cafd2e25d103381..924a005d8518df02ae329e5a3fd695e24b768cf5 100644
--- a/semantic_router/encoders/openai.py
+++ b/semantic_router/encoders/openai.py
@@ -28,11 +28,11 @@ class OpenAIEncoder(BaseEncoder):
             name = os.getenv("OPENAI_MODEL_NAME", "text-embedding-ada-002")
         super().__init__(name=name, score_threshold=score_threshold)
         api_key = openai_api_key or os.getenv("OPENAI_API_KEY")
-        org_id = openai_org_id or os.getenv("OPENAI_ORGANIZATION")
-        if (api_key is None) and (org_id is None):
+        openai_org_id = openai_org_id or os.getenv("OPENAI_ORG_ID")
+        if (api_key is None):
             raise ValueError("OpenAI API key cannot be 'None'.")
         try:
-            self.client = openai.Client(api_key=api_key, organization=org_id)
+            self.client = openai.Client(api_key=api_key, organization=openai_org_id)
         except Exception as e:
             raise ValueError(
                 f"OpenAI API client failed to initialize. Error: {e}"