diff --git a/kernel/heap.c b/kernel/heap.c
index 317b82e..33859c1 100644
--- a/kernel/heap.c
+++ b/kernel/heap.c
@@ -3,7 +3,7 @@
 #include <kernel/heap.h>
 #include <debugging.h>
 
-#define HEAP_SIZE (256 * 4096)
+#define HEAP_SIZE (4096)
 
 uint8_t* global_heap_data[HEAP_SIZE + sizeof(struct Heap_Block)];
 struct Heap_Metadata global_heap;
@@ -63,7 +63,7 @@ void free(void *ptr)
 
     struct Heap_Block* start = current;
 
-    while (current->used == false && current->next != 0) {
+    while (current->used == false && current != 0) {
         current = current->next;
     }