diff --git a/server/automation/service/workflow.go b/server/automation/service/workflow.go
index 99ca2aa35..dd89d4299 100644
--- a/server/automation/service/workflow.go
+++ b/server/automation/service/workflow.go
@@ -543,10 +543,12 @@ func (svc *workflow) updateCache(wf *types.Workflow, runAs intAuth.Identifiable,
 	svc.muxCache.Lock()
 
 	if wf.Executable() {
+		svc.wIndex[wf.Handle] = wf.ID
 		svc.cache[wf.ID] = &wfCacheItem{g: g, wf: wf, runAs: runAs}
 	} else {
 		// remove deleted
 		delete(svc.cache, wf.ID)
+		delete(svc.wIndex, wf.Handle)
 	}
 
 	return