diff --git a/src/data-structures/queue/queue.ts b/src/data-structures/queue/queue.ts
index 32a7bab..6be108c 100644
--- a/src/data-structures/queue/queue.ts
+++ b/src/data-structures/queue/queue.ts
@@ -15,8 +15,8 @@ export class LinkedListQueue<E = any> extends SinglyLinkedList<E> {
   }
 
   /**
-   * The `dequeue` function removes and returns the first element from a queue, or returns null if the queue is empty.
-   * @returns The method is returning the element at the front of the queue, or null if the queue is empty.
+   * The `dequeue` function removes and returns the first element from a queue, or returns undefined if the queue is empty.
+   * @returns The method is returning the element at the front of the queue, or undefined if the queue is empty.
    */
   dequeue(): E | undefined {
     return this.shift();
@@ -112,7 +112,7 @@ export class Queue<E = any> {
    *
    * The `shift` function removes and returns the first element in the queue, and adjusts the internal data structure if
    * necessary to optimize performance.
-   * @returns The function `shift()` returns either the first element in the queue or `null` if the queue is empty.
+   * @returns The function `shift()` returns either the first element in the queue or `undefined` if the queue is empty.
    */
   shift(): E | undefined {
     if (this.size === 0) return undefined;
@@ -138,9 +138,9 @@ export class Queue<E = any> {
    * Time Complexity: O(1) - constant time as it retrieves the value at the current offset.
    * Space Complexity: O(1) - no additional space is used.
    *
-   * The `getFirst` function returns the first element of the array `_nodes` if it exists, otherwise it returns `null`.
+   * The `getFirst` function returns the first element of the array `_nodes` if it exists, otherwise it returns `undefined`.
    * @returns The `getFirst()` method returns the first element of the data structure, represented by the `_nodes` array at
-   * the `_offset` index. If the data structure is empty (size is 0), it returns `null`.
+   * the `_offset` index. If the data structure is empty (size is 0), it returns `undefined`.
    */
   getFirst(): E | undefined {
     return this.size > 0 ? this.nodes[this.offset] : undefined;
@@ -155,9 +155,9 @@ export class Queue<E = any> {
    * Time Complexity: O(1) - constant time as it retrieves the value at the current offset.
    * Space Complexity: O(1) - no additional space is used.
    *
-   * The `peek` function returns the first element of the array `_nodes` if it exists, otherwise it returns `null`.
+   * The `peek` function returns the first element of the array `_nodes` if it exists, otherwise it returns `undefined`.
    * @returns The `peek()` method returns the first element of the data structure, represented by the `_nodes` array at
-   * the `_offset` index. If the data structure is empty (size is 0), it returns `null`.
+   * the `_offset` index. If the data structure is empty (size is 0), it returns `undefined`.
    */
   peek(): E | undefined {
     return this.getFirst();
@@ -172,9 +172,9 @@ export class Queue<E = any> {
    * Time Complexity: O(1) - constant time as it retrieves the value at the current offset.
    * Space Complexity: O(1) - no additional space is used.
    *
-   * The `getLast` function returns the last element in an array-like data structure, or null if the structure is empty.
+   * The `getLast` function returns the last element in an array-like data structure, or undefined if the structure is empty.
    * @returns The method `getLast()` returns the last element of the `_nodes` array if the array is not empty. If the
-   * array is empty, it returns `null`.
+   * array is empty, it returns `undefined`.
    */
   getLast(): E | undefined {
     return this.size > 0 ? this.nodes[this.nodes.length - 1] : undefined;
@@ -189,9 +189,9 @@ export class Queue<E = any> {
    * Time Complexity: O(1) - constant time as it retrieves the value at the current offset.
    * Space Complexity: O(1) - no additional space is used.
    *
-   * The `peekLast` function returns the last element in an array-like data structure, or null if the structure is empty.
+   * The `peekLast` function returns the last element in an array-like data structure, or undefined if the structure is empty.
    * @returns The method `peekLast()` returns the last element of the `_nodes` array if the array is not empty. If the
-   * array is empty, it returns `null`.
+   * array is empty, it returns `undefined`.
    */
   peekLast(): E | undefined {
     return this.getLast();
@@ -222,8 +222,8 @@ export class Queue<E = any> {
    * Time Complexity: O(n) - same as shift().
    * Space Complexity: O(1) - same as shift().
    *
-   * The `dequeue` function removes and returns the first element from a queue, or returns null if the queue is empty.
-   * @returns The method is returning a value of type E or null.
+   * The `dequeue` function removes and returns the first element from a queue, or returns undefined if the queue is empty.
+   * @returns The method is returning a value of type E or undefined.
    */
   dequeue(): E | undefined {
     return this.shift();
diff --git a/src/data-structures/stack/stack.ts b/src/data-structures/stack/stack.ts
index 93cb0d3..3ba5d3a 100644
--- a/src/data-structures/stack/stack.ts
+++ b/src/data-structures/stack/stack.ts
@@ -68,11 +68,11 @@ export class Stack<E = any> {
    * Time Complexity: O(1), as it only involves accessing the last element of the array.
    * Space Complexity: O(1), as it does not use any additional space.
    *
-   * The `peek` function returns the last element of an array, or null if the array is empty.
-   * @returns The `peek()` function returns the last element of the `_elements` array, or `null` if the array is empty.
+   * The `peek` function returns the last element of an array, or undefined if the array is empty.
+   * @returns The `peek()` function returns the last element of the `_elements` array, or `undefined` if the array is empty.
    */
-  peek(): E | null {
-    if (this.isEmpty()) return null;
+  peek(): E | undefined {
+    if (this.isEmpty()) return undefined;
 
     return this.elements[this.elements.length - 1];
   }
@@ -104,14 +104,14 @@ export class Stack<E = any> {
    * Time Complexity: O(1), as it only involves accessing the last element of the array.
    * Space Complexity: O(1), as it does not use any additional space.
    *
-   * The `pop` function removes and returns the last element from an array, or returns null if the array is empty.
+   * The `pop` function removes and returns the last element from an array, or returns undefined if the array is empty.
    * @returns The `pop()` method is returning the last element of the array `_elements` if the array is not empty. If the
-   * array is empty, it returns `null`.
+   * array is empty, it returns `undefined`.
    */
-  pop(): E | null {
-    if (this.isEmpty()) return null;
+  pop(): E | undefined {
+    if (this.isEmpty()) return undefined;
 
-    return this.elements.pop() || null;
+    return this.elements.pop() || undefined;
   }
 
   /**
diff --git a/test/unit/data-structures/queue/deque.test.ts b/test/unit/data-structures/queue/deque.test.ts
index d5e23f3..12ffd8e 100644
--- a/test/unit/data-structures/queue/deque.test.ts
+++ b/test/unit/data-structures/queue/deque.test.ts
@@ -154,7 +154,7 @@ describe('Deque', () => {
     expect(deque.getAt(2)).toBe(3);
   });
 
-  it('should return null for out-of-bounds index', () => {
+  it('should return undefined for out-of-bounds index', () => {
     // expect(deque.getAt(0)).toThrowError('Index out of bounds.');
     // expect(deque.getAt(1)).toThrow('Index out of bounds');
     // expect(deque.getAt(-1)).toThrow('Index out of bounds');
diff --git a/test/unit/data-structures/stack/stack.test.ts b/test/unit/data-structures/stack/stack.test.ts
index 15118d9..3f31d3c 100644
--- a/test/unit/data-structures/stack/stack.test.ts
+++ b/test/unit/data-structures/stack/stack.test.ts
@@ -35,9 +35,9 @@ describe('Stack', () => {
     expect(stack.size).toBe(2);
   });
 
-  it('should return null when popping from an empty stack', () => {
+  it('should return undefined when popping from an empty stack', () => {
     const poppedElement = stack.pop();
-    expect(poppedElement).toBeNull();
+    expect(poppedElement).toBe(undefined);
   });
 
   it('should convert the stack to an array', () => {