diff --git a/ui/src/app/dashboard/states/entity-state-controller.js b/ui/src/app/dashboard/states/entity-state-controller.js
index 1e2c2ade17..8d5cddd7b8 100644
--- a/ui/src/app/dashboard/states/entity-state-controller.js
+++ b/ui/src/app/dashboard/states/entity-state-controller.js
@@ -139,6 +139,11 @@ export default function EntityStateController($scope, $location, $state, $stateP
             var params = vm.stateObject[index].params;
             var entityName = params && params.entityName ? params.entityName : '';
             result = utils.insertVariable(stateName, 'entityName', entityName);
+            for (var prop in params) {
+                if (params[prop] && params[prop].entityName) {
+                    result = utils.insertVariable(stateName, prop + ':entityName', params[prop].entityName);
+                }
+            }
         }
         return result;
     }
@@ -163,7 +168,7 @@ export default function EntityStateController($scope, $location, $state, $stateP
                 );
             }
         } else {
-            deferred.reject();
+            deferred.resolve('');
         }
         return deferred.promise;
     }