diff --git a/server/remote/gitea/gitea.go b/server/remote/gitea/gitea.go
index 3259096ab..fb29823b2 100644
--- a/server/remote/gitea/gitea.go
+++ b/server/remote/gitea/gitea.go
@@ -381,8 +381,19 @@ func (c *Gitea) Activate(ctx context.Context, u *model.User, r *model.Repo, link
 	if err != nil {
 		return err
 	}
-	_, _, err = client.CreateRepoHook(r.Owner, r.Name, hook)
-	return err
+	_, response, err := client.CreateRepoHook(r.Owner, r.Name, hook)
+	if err != nil {
+		if response != nil {
+			if response.StatusCode == 404 {
+				return fmt.Errorf("Could not find repository")
+			}
+			if response.StatusCode == 200 {
+				return fmt.Errorf("Could not find repository, repository was probably renamed")
+			}
+		}
+		return err
+	}
+	return nil
 }
 
 // Deactivate deactives the repository be removing repository push hooks from