diff --git a/http/org_service.go b/http/org_service.go
index 9615590715..e4a7172b44 100644
--- a/http/org_service.go
+++ b/http/org_service.go
@@ -357,7 +357,11 @@ func decodeDeleteOrganizationRequest(ctx context.Context, r *http.Request) (*del
 
 	var i influxdb.ID
 	if err := i.DecodeFromString(id); err != nil {
-		return nil, err
+		return nil, &influxdb.Error{
+			Code: influxdb.EInvalid,
+			Msg:  "bad org id",
+			Err:  err,
+		}
 	}
 	req := &deleteOrganizationRequest{
 		OrganizationID: i,