diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb825738..ed07da7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Enh #306: Minor refactoring (@Tigrov)
 - New #307: Add parameters `$ifExists` and `$cascade` to `CommandInterface::dropTable()` and
   `DDLQueryBuilderInterface::dropTable()` methods (@vjik)
+- Chg #310: Remove usage of `hasLimit()` and `hasOffset()` methods of `DQLQueryBuilder` class (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 
diff --git a/src/DQLQueryBuilder.php b/src/DQLQueryBuilder.php
index 1735254e..d9e695cb 100644
--- a/src/DQLQueryBuilder.php
+++ b/src/DQLQueryBuilder.php
@@ -36,14 +36,14 @@ public function buildOrderByAndLimit(
 
         $filters = [];
 
-        if ($this->hasOffset($offset)) {
+        if (!empty($offset)) {
             $filters[] = 'rowNumId > ' .
-                ($offset instanceof ExpressionInterface ? $this->buildExpression($offset) : (string)$offset);
+                ($offset instanceof ExpressionInterface ? $this->buildExpression($offset) : (string) $offset);
         }
 
-        if ($this->hasLimit($limit)) {
+        if ($limit !== null) {
             $filters[] = 'rownum <= ' .
-                ($limit instanceof ExpressionInterface ? $this->buildExpression($limit) : (string)$limit);
+                ($limit instanceof ExpressionInterface ? $this->buildExpression($limit) : (string) $limit);
         }
 
         if (empty($filters)) {