diff --git a/kernel/include/kernel/Debug.h b/kernel/include/kernel/Debug.h
index 11ffcde5..d34c0fca 100644
--- a/kernel/include/kernel/Debug.h
+++ b/kernel/include/kernel/Debug.h
@@ -5,23 +5,29 @@
 
 #define dprintln(...)																																\
 	do {																																			\
+		Debug::DebugLock::lock();																													\
 		BAN::Formatter::print(Debug::putchar, "[{5}.{3}] {}:{}:  ", PIT::ms_since_boot() / 1000, PIT::ms_since_boot() % 1000, __FILE__, __LINE__);	\
 		BAN::Formatter::print(Debug::putchar, __VA_ARGS__);																							\
 		BAN::Formatter::print(Debug::putchar, "\r\n");																								\
+		Debug::DebugLock::unlock();																													\
 	} while(false)
 
-#define dwarnln(...)											\
-	do {														\
+#define dwarnln(...)										\
+	do {													\
+		Debug::DebugLock::lock();							\
 		BAN::Formatter::print(Debug::putchar, "\e[33m");	\
-		dprintln(__VA_ARGS__);									\
+		dprintln(__VA_ARGS__);								\
 		BAN::Formatter::print(Debug::putchar, "\e[m");		\
+		Debug::DebugLock::unlock();							\
 	} while(false)
 
-#define derrorln(...)											\
-	do {														\
+#define derrorln(...)										\
+	do {													\
+		Debug::DebugLock::lock();							\
 		BAN::Formatter::print(Debug::putchar, "\e[31m");	\
-		dprintln(__VA_ARGS__);									\
+		dprintln(__VA_ARGS__);								\
 		BAN::Formatter::print(Debug::putchar, "\e[m");		\
+		Debug::DebugLock::unlock();							\
 	} while(false)
 
 #define BOCHS_BREAK() asm volatile("xchgw %bx, %bx")
@@ -30,4 +36,11 @@ namespace Debug
 {
 	void dump_stack_trace();
 	void putchar(char);
+
+	class DebugLock
+	{
+	public:
+		static void lock();
+		static void unlock();
+	};
 }
\ No newline at end of file
diff --git a/kernel/kernel/Debug.cpp b/kernel/kernel/Debug.cpp
index 7c381280..ae88f12b 100644
--- a/kernel/kernel/Debug.cpp
+++ b/kernel/kernel/Debug.cpp
@@ -1,5 +1,7 @@
 #include <kernel/Debug.h>
+#include <kernel/InterruptController.h>
 #include <kernel/Serial.h>
+#include <kernel/SpinLock.h>
 #include <kernel/Terminal/TTY.h>
 
 namespace Debug
@@ -53,4 +55,19 @@ namespace Debug
 			return Kernel::TTY::putchar_current(ch);
 	}
 
+
+	static Kernel::RecursiveSpinLock s_debug_lock;
+
+	void DebugLock::lock()
+	{
+		if (interrupts_enabled())
+			s_debug_lock.lock();
+	}
+
+	void DebugLock::unlock()
+	{
+		if (interrupts_enabled())
+			s_debug_lock.unlock();
+	}
+
 }
\ No newline at end of file