diff --git a/base/src/core/include/signal_root.h b/base/src/core/include/signal_root.h
index 4317ddede0..0aa6245711 100644
--- a/base/src/core/include/signal_root.h
+++ b/base/src/core/include/signal_root.h
@@ -26,7 +26,7 @@ namespace Genode {
 	{
 		private:
 
-			enum { STACK_SIZE = 4096 };
+			enum { STACK_SIZE = sizeof(addr_t)*1024 };
 			Rpc_entrypoint _ep;
 
 		public:
diff --git a/gems/src/server/terminal/main.cc b/gems/src/server/terminal/main.cc
index 4edcad1ba0..1c808deecf 100644
--- a/gems/src/server/terminal/main.cc
+++ b/gems/src/server/terminal/main.cc
@@ -1340,7 +1340,7 @@ int main(int, char **)
 	                       (env()->rm_session()->attach(ev_ds_cap));
 
 	/* initialize entry point that serves the root interface */
-	enum { STACK_SIZE = 4096 };
+	enum { STACK_SIZE = sizeof(addr_t)*1024 };
 	static Rpc_entrypoint ep(&cap, STACK_SIZE, "terminal_ep");
 
 	static Sliced_heap sliced_heap(env()->ram_session(), env()->rm_session());
diff --git a/os/src/drivers/input/ps2/x86/main.cc b/os/src/drivers/input/ps2/x86/main.cc
index 4ffe278f32..4400318013 100644
--- a/os/src/drivers/input/ps2/x86/main.cc
+++ b/os/src/drivers/input/ps2/x86/main.cc
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 	/*
 	 * Initialize server entry point
 	 */
-	enum { STACK_SIZE = 4096 };
+	enum { STACK_SIZE = sizeof(addr_t)*1024 };
 	static Cap_connection cap;
 	static Rpc_entrypoint ep(&cap, STACK_SIZE, "ps2_ep");
 
diff --git a/os/src/drivers/pci/main.cc b/os/src/drivers/pci/main.cc
index 72245cac1d..058501e6a1 100644
--- a/os/src/drivers/pci/main.cc
+++ b/os/src/drivers/pci/main.cc
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
 	/*
 	 * Initialize server entry point
 	 */
-	enum { STACK_SIZE = 4096 };
+	enum { STACK_SIZE = sizeof(addr_t)*1024 };
 	static Cap_connection cap;
 	static Rpc_entrypoint ep(&cap, STACK_SIZE, "pci_ep");