diff --git a/embedchain/apps/app.py b/embedchain/apps/app.py
index a6129a3f..63a44f37 100644
--- a/embedchain/apps/app.py
+++ b/embedchain/apps/app.py
@@ -2,8 +2,8 @@ from typing import Optional
 
 import yaml
 
-from embedchain.config import (AppConfig, BaseEmbedderConfig, BaseLlmConfig,
-                               ChunkerConfig)
+from embedchain.client import Client
+from embedchain.config import AppConfig, BaseEmbedderConfig, BaseLlmConfig, ChunkerConfig
 from embedchain.config.vectordb.base import BaseVectorDbConfig
 from embedchain.embedchain import EmbedChain
 from embedchain.embedder.base import BaseEmbedder
@@ -67,6 +67,9 @@ class App(EmbedChain):
         :type system_prompt: Optional[str], optional
         :raises TypeError: LLM, database or embedder or their config is not a valid class instance.
         """
+        # Setup user directory if it doesn't exist already
+        Client.setup_dir()
+
         # Type check configs
         if config and not isinstance(config, AppConfig):
             raise TypeError(