diff --git a/src/OracleProvider/Query/Sql/Internal/OracleQuerySqlGenerator.cs b/src/OracleProvider/Query/Sql/Internal/OracleQuerySqlGenerator.cs
index 3f25889..b49908c 100644
--- a/src/OracleProvider/Query/Sql/Internal/OracleQuerySqlGenerator.cs
+++ b/src/OracleProvider/Query/Sql/Internal/OracleQuerySqlGenerator.cs
@@ -210,7 +210,16 @@ public override Expression VisitSelect(SelectExpression selectExpression)
 
                 if (RequiresRowNumberPaging(selectExpression))
                 {
-                    Sql.Append(",rownum RN ");
+                    if (selectExpression.OrderBy != null && selectExpression.OrderBy.Any())
+                    {
+                        string fields = string.Join(",", selectExpression.OrderBy.Select(x => x.ToString()).ToArray());
+                        Sql.Append(string.Format(", row_number() over(order by {0}) RN ", fields));
+                    }
+                    else
+                    {
+                        Sql.Append(",rownum RN ");
+                    }
+
                 }
             }