diff --git a/juju/utils.py b/juju/utils.py
index 46470b53e..b926daf09 100644
--- a/juju/utils.py
+++ b/juju/utils.py
@@ -49,13 +49,11 @@ def juju_config_dir():
     config_dir = Path('~/.local/share/juju')
 
     # Check $JUJU_DATA
-    juju_data = os.environ.get('JUJU_DATA')
+    if os.environ.get('JUJU_DATA'):
+        config_dir = Path(os.environ.get('JUJU_DATA'))
     # Secondly check: $XDG_DATA_HOME for ~/.local/share
-    xdg_data_home = os.environ.get('XDG_DATA_HOME')
-    if juju_data:
-        config_dir = Path(juju_data)
-    elif xdg_data_home:
-        config_dir = Path(xdg_data_home) / 'juju'
+    elif os.environ.get('XDG_DATA_HOME'):
+        config_dir = Path(os.environ.get('XDG_DATA_HOME')) / 'juju'
 
     return str(config_dir.expanduser().resolve())