diff --git a/src/pystencilssfg/composer/gpu_composer.py b/src/pystencilssfg/composer/gpu_composer.py
index 274c81ccb6c1e537996630f5d1b83f3b0ea7cf1b..4c3a8a4fd463a5e39273331961ddd4c4825407a6 100644
--- a/src/pystencilssfg/composer/gpu_composer.py
+++ b/src/pystencilssfg/composer/gpu_composer.py
@@ -85,8 +85,13 @@ class SfgGpuComposer(SfgComposerMixIn):
         self._gpu_api_provider = HipAPI()
 
     @property
-    def gpu_api(self) -> ProvidesGpuRuntimeAPI:
-        """GPU runtime API wrapper currently used by this GPU composer.
+    def gpu_api(self) -> ProvidesGpuRuntimeAPI | None:
+        """GPU runtime API wrapper currently used by this GPU composer,
+        or `None` if none was selected."""
+        return self._gpu_api_provider
+
+    def get_gpu_api(self) -> ProvidesGpuRuntimeAPI:
+        """GPU runtime API provider currently used by this GPU composer.
 
         Raises:
             AttributeError: If no runtime API was set yet (see `use_cuda`, `use_hip`)
@@ -140,7 +145,7 @@ class SfgGpuComposer(SfgComposerMixIn):
 
         launch_config = ker.get_launch_configuration()
 
-        dim3 = self.gpu_api.dim3
+        dim3 = self.get_gpu_api().dim3
 
         grid_size: ExprLike
         block_size: ExprLike