diff --git a/repos/base-linux/src/core/include/region_map_component.h b/repos/base-linux/src/core/include/region_map_component.h
index efdedd90d..6d99b7ac1 100644
--- a/repos/base-linux/src/core/include/region_map_component.h
+++ b/repos/base-linux/src/core/include/region_map_component.h
@@ -45,7 +45,7 @@ class Genode::Region_map_component : public Rpc_object<Region_map>,
 
 	public:
 
-		Region_map_component(Rpc_entrypoint &, Allocator &, Pager_entrypoint &,
+		Region_map_component(Rpc_entrypoint &, Allocator &, Pager_entrypoint *,
 		                     addr_t, size_t, Session::Diag) { }
 
 		void upgrade_ram_quota(size_t) { }
diff --git a/repos/base/src/core/include/core_env.h b/repos/base/src/core/include/core_env.h
index 4afb14e0b..40768ea50 100644
--- a/repos/base/src/core/include/core_env.h
+++ b/repos/base/src/core/include/core_env.h
@@ -72,7 +72,7 @@ class Genode::Core_env : public Env_deprecated, Noncopyable
 			            Ram_dataspace_factory::Virt_range { platform().vm_start(),
 			                                                platform().vm_size() },
 			            _region_map,
-			            *((Pager_entrypoint *)nullptr),
+			            nullptr,
 			            "" /* args to native PD */,
 			            platform_specific().core_mem_alloc())
 		{
diff --git a/repos/base/src/core/include/pd_root.h b/repos/base/src/core/include/pd_root.h
index 3b78c551b..fbe8a6477 100644
--- a/repos/base/src/core/include/pd_root.h
+++ b/repos/base/src/core/include/pd_root.h
@@ -70,7 +70,7 @@ class Genode::Pd_root : public Genode::Root_component<Genode::Pd_session_compone
 				                     _phys_alloc,
 				                     _phys_range_from_args(args),
 				                     _virt_range_from_args(args),
-				                     _local_rm, _pager_ep, args,
+				                     _local_rm, &_pager_ep, args,
 				                     _core_mem);
 		}
 
diff --git a/repos/base/src/core/include/pd_session_component.h b/repos/base/src/core/include/pd_session_component.h
index 002f49c79..a10b571a7 100644
--- a/repos/base/src/core/include/pd_session_component.h
+++ b/repos/base/src/core/include/pd_session_component.h
@@ -124,7 +124,7 @@ class Genode::Pd_session_component : public Session_object<Pd_session>
 		                     Phys_range        phys_range,
 		                     Virt_range        virt_range,
 		                     Region_map       &local_rm,
-		                     Pager_entrypoint &pager_ep,
+		                     Pager_entrypoint *pager_ep,
 		                     char const       *args,
 		                     Range_allocator  &core_mem)
 		:
diff --git a/repos/base/src/core/include/region_map_component.h b/repos/base/src/core/include/region_map_component.h
index 7eab656ff..d537cc350 100644
--- a/repos/base/src/core/include/region_map_component.h
+++ b/repos/base/src/core/include/region_map_component.h
@@ -305,7 +305,7 @@ class Genode::Region_map_component : private Weak_object<Region_map_component>,
 		                                                for fault resolution */
 		List<Rm_client>               _clients  { }; /* list of RM clients using this region map */
 		Lock                          _lock     { }; /* lock for map and list */
-		Pager_entrypoint             &_pager_ep;
+		Pager_entrypoint             *_pager_ep;
 		Rm_dataspace_component        _ds;           /* dataspace representation of region map */
 		Dataspace_capability          _ds_cap;
 
@@ -375,7 +375,7 @@ class Genode::Region_map_component : private Weak_object<Region_map_component>,
 		 */
 		Region_map_component(Rpc_entrypoint   &ep,
 		                     Allocator        &md_alloc,
-		                     Pager_entrypoint &pager_ep,
+		                     Pager_entrypoint *pager_ep,
 		                     addr_t            vm_start,
 		                     size_t            vm_size,
 		                     Session::Diag     diag);
diff --git a/repos/base/src/core/include/rm_session_component.h b/repos/base/src/core/include/rm_session_component.h
index be9ef0cc1..45d8b14eb 100644
--- a/repos/base/src/core/include/rm_session_component.h
+++ b/repos/base/src/core/include/rm_session_component.h
@@ -76,7 +76,7 @@ class Genode::Rm_session_component : public Rpc_object<Rm_session>
 			try {
 				Region_map_component *rm =
 					new (_md_alloc)
-						Region_map_component(_ep, _md_alloc, _pager_ep, 0, size,
+						Region_map_component(_ep, _md_alloc, &_pager_ep, 0, size,
 						                     Diag{false});
 
 				_region_maps.insert(rm);
diff --git a/repos/base/src/core/region_map_component.cc b/repos/base/src/core/region_map_component.cc
index 81190f3e3..0f6f5946a 100644
--- a/repos/base/src/core/region_map_component.cc
+++ b/repos/base/src/core/region_map_component.cc
@@ -644,7 +644,7 @@ _type_deduction_helper(Dataspace_capability cap) { return cap; }
 
 Region_map_component::Region_map_component(Rpc_entrypoint   &ep,
                                            Allocator        &md_alloc,
-                                           Pager_entrypoint &pager_ep,
+                                           Pager_entrypoint *pager_ep,
                                            addr_t            vm_start,
                                            size_t            vm_size,
                                            Session::Diag     diag)