diff --git a/heat/engine/service.py b/heat/engine/service.py
index 3e903143c4..31b6874da6 100644
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -539,7 +539,8 @@ class EngineService(service.ServiceBase):
             for stack in stacks:
                 if stack.convergence:
                     for res in six.itervalues(stack.resources):
-                        res.store_attributes()
+                        if res.id is not None:
+                            res.store_attributes()
         return retval
 
     def get_revision(self, cnxt):