diff --git a/host/commands/secure_env/keymaster_responder.h b/host/commands/secure_env/keymaster_responder.h
index 1fc662e..f8fb6ec 100644
--- a/host/commands/secure_env/keymaster_responder.h
+++ b/host/commands/secure_env/keymaster_responder.h
@@ -21,11 +21,11 @@
 
 class KeymasterResponder {
 private:
-  cuttlefish::KeymasterChannel* channel_;
-  keymaster::AndroidKeymaster* keymaster_;
+  cuttlefish::KeymasterChannel& channel_;
+  keymaster::AndroidKeymaster& keymaster_;
 public:
-  KeymasterResponder(cuttlefish::KeymasterChannel* channel,
-                     keymaster::AndroidKeymaster* keymaster);
+  KeymasterResponder(cuttlefish::KeymasterChannel& channel,
+                     keymaster::AndroidKeymaster& keymaster);
 
   bool ProcessMessage();
 };