diff --git a/volttron/platform/instance_setup.py b/volttron/platform/instance_setup.py
index 161b2bbab9..d00e2e4180 100644
--- a/volttron/platform/instance_setup.py
+++ b/volttron/platform/instance_setup.py
@@ -267,7 +267,9 @@ def func(*args, **kwargs):
             _shutdown_platform()
 
             if identity is not None:
-                os.environ.pop('AGENT_VIP_IDENTITY')
+                # If identity was specified then we don't want the global 
+                # AGENT_VIP_IDENTITY to be set.
+                os.environ.pop('AGENT_VIP_IDENTITY', None)
 
         available_agents[tag] = func
         return func