diff --git a/controller/watchApi.go b/controller/watchApi.go
index 34e4a4d9..329b833b 100644
--- a/controller/watchApi.go
+++ b/controller/watchApi.go
@@ -55,7 +55,14 @@ func (api *API) WatchApiCreate(w http.ResponseWriter, r *http.Request) {
 		api.respondWithError(w, err)
 		return
 	}
-	watch.Url = fission.UrlForFunction(&watch.Function)
+
+	function, err := api.FunctionStore.Get(&watch.Function)
+	if err != nil {
+		api.respondWithError(w, err)
+		return
+	}
+
+	watch.Url = fission.UrlForFunction(&function.Metadata)
 
 	uid, err := api.WatchStore.Create(&watch)
 	if err != nil {