diff --git a/src/cpl_cli/command_handler_service.py b/src/cpl_cli/command_handler_service.py
index cb6d468a..13e850a2 100644
--- a/src/cpl_cli/command_handler_service.py
+++ b/src/cpl_cli/command_handler_service.py
@@ -81,7 +81,7 @@ class CommandHandler(ABC):
                         self._project_not_found()
                         return
 
-                    else:
+                    elif command.is_workspace_needed or project_name is None:
                         if workspace is None:
                             Error.error(
                                 'The command requires to be run in an CPL workspace or project, '