diff --git a/deployments/crypto/common/crypto_sp.c b/deployments/crypto/common/crypto_sp.c
index b198d19..eba486b 100644
--- a/deployments/crypto/common/crypto_sp.c
+++ b/deployments/crypto/common/crypto_sp.c
@@ -17,10 +17,6 @@
 #include <sp_rxtx.h>
 #include <trace.h>
 
-
-uint16_t own_id = 0; /* !!Needs refactoring as parameter to ffarpc_caller_init */
-
-
 static int sp_init(uint16_t *own_sp_id);
 
 void __noreturn sp_main(struct ffa_init_info *init_info)
@@ -31,6 +27,7 @@
 	struct sp_msg req_msg = { 0 };
 	struct sp_msg resp_msg = { 0 };
 	struct storage_backend *storage_backend;
+	uint16_t own_id = 0;
 
 	/* Boot phase */
 	if (sp_init(&own_id) != 0) goto fatal_error;