diff --git a/cattle/plugins/docker/agent.py b/cattle/plugins/docker/agent.py
index 2684bfe..aa5207d 100644
--- a/cattle/plugins/docker/agent.py
+++ b/cattle/plugins/docker/agent.py
@@ -3,8 +3,16 @@
 from urlparse import urlparse
 
 
+def _has_label(instance):
+    try:
+        return instance.labels['io.rancher.container.cattle_url'] == 'true'
+    except:
+        pass
+    return False
+
+
 def setup_cattle_config_url(instance, create_config):
-    if instance.get('agentId') is None:
+    if instance.get('agentId') is None and not _has_label(instance):
         return
 
     if 'labels' not in create_config: