diff --git a/salt/workstation/init.sls b/salt/workstation/init.sls
index c786cdab5..e270c0430 100644
--- a/salt/workstation/init.sls
+++ b/salt/workstation/init.sls
@@ -1,3 +1,7 @@
 include:
   - workstation.xwindows
+{# If the master is 'salt' then the minion hasn't been configured and isn't connected to the grid. #}
+{# We need this since the trusted-ca state uses mine data. #}
+{% if grains.master != 'salt' %}
   - workstation.trusted-ca
+{% endif %}