diff --git a/repos/base/src/lib/base/entrypoint.cc b/repos/base/src/lib/base/entrypoint.cc
index 3227af05e..2c4b56e32 100644
--- a/repos/base/src/lib/base/entrypoint.cc
+++ b/repos/base/src/lib/base/entrypoint.cc
@@ -191,6 +191,10 @@ void Entrypoint::_process_incoming_signals()
 
 bool Entrypoint::_wait_and_dispatch_one_io_signal(bool const dont_block)
 {
+	if (!_rpc_ep->is_myself())
+		warning(__func__, " called from non-entrypoint thread \"",
+		       Thread::myself()->name(), "\"");
+
 	for (;;) {
 
 		try {