diff --git a/apps/cli/__init__.py b/apps/cli/__init__.py
index df7cf41..0861ee2 100644
--- a/apps/cli/__init__.py
+++ b/apps/cli/__init__.py
@@ -1,6 +1,6 @@
 import os
 import apps.cli.conf as conf
-from common.tools import extend_paths, check_conf_fields, setup_logging
+from common.tools import extend_paths, check_conf_fields, setup_logging, setup_data_folder
 
 LOG_PREFIX = "cli"
 
@@ -24,4 +24,5 @@ conf_fields = extend_paths(conf_fields["DATA_FOLDER"]["value"], conf_fields)
 # Sanity check fields and build config dictionary
 config = check_conf_fields(conf_fields)
 
+setup_data_folder(config.get("DATA_FOLDER"))
 setup_logging(config.get("CLIENT_LOG_FILE"), LOG_PREFIX)
diff --git a/apps/cli/pisa_cli.py b/apps/cli/pisa_cli.py
index 6bc8346..41fce7f 100644
--- a/apps/cli/pisa_cli.py
+++ b/apps/cli/pisa_cli.py
@@ -16,7 +16,7 @@ from apps.cli.blob import Blob
 from common.logger import Logger
 from common.appointment import Appointment
 from common.cryptographer import Cryptographer
-from common.tools import check_sha256_hex_format, check_locator_format, compute_locator, setup_data_folder
+from common.tools import check_sha256_hex_format, check_locator_format, compute_locator
 
 
 HTTP_OK = 200
@@ -343,9 +343,6 @@ if __name__ == "__main__":
     commands = ["add_appointment", "get_appointment", "help"]
     testing_commands = ["generate_dummy_appointment"]
 
-    # Create user folder if missing
-    setup_data_folder(config.get("DATA_FOLDER"), logger)
-
     try:
         opts, args = getopt(argv[1:], "s:p:h", ["server", "port", "help"])
 
diff --git a/common/tools.py b/common/tools.py
index 8e0617c..0c131da 100644
--- a/common/tools.py
+++ b/common/tools.py
@@ -42,17 +42,15 @@ def compute_locator(tx_id):
     return tx_id[:LOCATOR_LEN_HEX]
 
 
-def setup_data_folder(data_folder, logger):
+def setup_data_folder(data_folder):
     """
     Create a data folder for either the client or the server side if the folder does not exists.
 
     Args:
         data_folder (:obj:`str`): the path of the folder
-        logger (:obj: `Logger <common.logger.Logger>`): a logger instance to notify about the folder creation.
     """
 
     if not os.path.isdir(data_folder):
-        logger.info("Data folder not found. Creating it")
         os.makedirs(data_folder, exist_ok=True)
 
 
diff --git a/pisa/__init__.py b/pisa/__init__.py
index e7d380b..2e5149f 100644
--- a/pisa/__init__.py
+++ b/pisa/__init__.py
@@ -1,6 +1,6 @@
 import os
 import pisa.conf as conf
-from common.tools import check_conf_fields, setup_logging, extend_paths
+from common.tools import check_conf_fields, setup_logging, extend_paths, setup_data_folder
 from pisa.utils.auth_proxy import AuthServiceProxy
 
 HOST = "localhost"
@@ -34,4 +34,5 @@ conf_fields = extend_paths(conf_fields["DATA_FOLDER"]["value"], conf_fields)
 # Sanity check fields and build config dictionary
 config = check_conf_fields(conf_fields)
 
+setup_data_folder(config.get("DATA_FOLDER"))
 setup_logging(config.get("SERVER_LOG_FILE"), LOG_PREFIX)
diff --git a/pisa/pisad.py b/pisa/pisad.py
index 1c35000..0335832 100644
--- a/pisa/pisad.py
+++ b/pisa/pisad.py
@@ -3,7 +3,6 @@ from sys import argv, exit
 from signal import signal, SIGINT, SIGQUIT, SIGTERM
 
 from common.logger import Logger
-from common.tools import setup_data_folder
 
 from pisa import config, LOG_PREFIX
 from pisa.api import API
@@ -34,8 +33,6 @@ def main():
     signal(SIGQUIT, handle_signals)
 
     logger.info("Starting PISA")
-
-    setup_data_folder(config.get("DATA_FOLDER"), logger)
     db_manager = DBManager(config.get("DB_PATH"))
 
     if not can_connect_to_bitcoind():