diff --git a/os/include/timer_session/connection.h b/os/include/timer_session/connection.h
index 3e8da3b7b1..6d47ec6c29 100644
--- a/os/include/timer_session/connection.h
+++ b/os/include/timer_session/connection.h
@@ -28,7 +28,8 @@ namespace Timer {
 			 * we donate two pages. One of them is used as stack for the
 			 * timer thread and the other page holds the session meta data.
 			 */
-			Genode::Connection<Session>(session("ram_quota=8K")),
+			Genode::Connection<Session>(session("ram_quota=%zd",
+			                                    sizeof(Genode::addr_t)*2048)),
 
 			Session_client(cap())
 		{ }
diff --git a/os/src/drivers/timer/foc/timer_session_component.h b/os/src/drivers/timer/foc/timer_session_component.h
index 761f34322c..b7e6bc420f 100644
--- a/os/src/drivers/timer/foc/timer_session_component.h
+++ b/os/src/drivers/timer/foc/timer_session_component.h
@@ -55,7 +55,7 @@ static Fiasco::l4_timeout_s mus_to_timeout(unsigned int mus)
 
 namespace Timer {
 
-	enum { STACK_SIZE = 4096 };
+	enum { STACK_SIZE = 1024 * sizeof(Genode::addr_t) };
 
 	/**
 	 * Timer session