diff --git a/base-nova/src/base/pager/pager.cc b/base-nova/src/base/pager/pager.cc
index 3d9bd641a6..ce2defa032 100644
--- a/base-nova/src/base/pager/pager.cc
+++ b/base-nova/src/base/pager/pager.cc
@@ -23,7 +23,7 @@
 using namespace Genode;
 using namespace Nova;
 
-enum { PF_HANDLER_STACK_SIZE = 4096 };
+enum { PF_HANDLER_STACK_SIZE = sizeof(addr_t) * 1024 };
 
 void Pager_object::_page_fault_handler()
 {
diff --git a/os/src/drivers/timer/nova/timer_session_component.h b/os/src/drivers/timer/nova/timer_session_component.h
index b7c89f4e6f..be809f060c 100644
--- a/os/src/drivers/timer/nova/timer_session_component.h
+++ b/os/src/drivers/timer/nova/timer_session_component.h
@@ -25,7 +25,7 @@
 
 namespace Timer {
 
-	enum { STACK_SIZE = 4096 };
+	enum { STACK_SIZE = sizeof(Genode::addr_t) * 1024 };
 
 	class Wake_up_alarm : public Genode::Alarm
 	{