diff --git a/server/src-lib/Hasura/GraphQL/Schema.hs b/server/src-lib/Hasura/GraphQL/Schema.hs
index 05101a7e..8c9dc714 100644
--- a/server/src-lib/Hasura/GraphQL/Schema.hs
+++ b/server/src-lib/Hasura/GraphQL/Schema.hs
@@ -1143,12 +1143,16 @@ input table_<op>_order_by {
 mkTabAggOpOrdByInpObjs
   :: QualifiedTable -> [PGCol] -> [PGCol] -> [InpObjTyInfo]
 mkTabAggOpOrdByInpObjs tn numCols compCols =
-  map (mkInpObjTy numCols) numAggOps <> map (mkInpObjTy compCols) compAggOps
+  mapMaybe (mkInpObjTyM numCols) numAggOps
+  <> mapMaybe (mkInpObjTyM compCols) compAggOps
   where
 
     mkDesc (G.Name op) = G.Description $ "order by " <> op <> "() on columns of table " <>> tn
+
+    mkInpObjTyM cols op = bool (Just $ mkInpObjTy cols op) Nothing $ null cols
     mkInpObjTy cols op = mkHsraInpTyInfo (Just $ mkDesc op) (mkTabAggOpOrdByTy tn op) $
                          fromInpValL $ map mkColInpVal cols
+
     mkColInpVal c = InpValInfo Nothing (mkColName c) $ G.toGT
                     ordByTy