diff --git a/docs/docs/dev_docs/contracts/syntax/storage.md b/docs/docs/dev_docs/contracts/syntax/storage.md
index 83960a13751..7560a8ab4f1 100644
--- a/docs/docs/dev_docs/contracts/syntax/storage.md
+++ b/docs/docs/dev_docs/contracts/syntax/storage.md
@@ -38,8 +38,12 @@ struct Storage {
 }
 ```
 
-:::info
-If your contract storage includes private state variables, it must include a `compute_note_hash_and_nullifier` function to allow the RPC to process encrypted events. See [encrypted events](./events.md#processing-encrypted-events) for more.
+:::danger
+If your contract works with storage (has Storage struct defined), you **MUST** include a `compute_note_hash_and_nullifier` function to allow PXE to process encrypted events. See [encrypted events](./events.md#processing-encrypted-events) for more.
+
+If you don't yet have any private state variables defined put there a placeholder function:
+
+#include_code compute_note_hash_and_nullifier_placeholder /yarn-project/noir-contracts/src/contracts/token_bridge_contract/src/main.nr rust
 :::
 
 Since Aztec.nr is written in Noir, which on its own is state-less, we need to specify how the storage struct should be initialized to read and write data correctly. This is done by specifying an `init` function that is run in functions that rely on reading or altering the state variables. This `init` function must declare the storage struct with an instantiation defining how variables are accessed and manipulated. The function MUST be called `init` for the Aztec.nr library to properly handle it (this will be relaxed in the future).
diff --git a/docs/docs/dev_docs/tutorials/writing_token_contract.md b/docs/docs/dev_docs/tutorials/writing_token_contract.md
index 9cd364c12e8..a430d71715d 100644
--- a/docs/docs/dev_docs/tutorials/writing_token_contract.md
+++ b/docs/docs/dev_docs/tutorials/writing_token_contract.md
@@ -242,7 +242,7 @@ We are importing the Option type, items from the `value_note` library to help ma
 
 [SafeU120](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/yarn-project/aztec-nr/safe-math/src/safe_u120.nr) is a library to do safe math operations on unsigned integers that protects against overflows and underflows.
 
-For more detail on execution contexts, see [Contract Communitaction](../../concepts/foundation/communication/main).
+For more detail on execution contexts, see [Contract Communication](../../concepts/foundation/communication/main).
 
 We are also importing types from a `types.nr` file. The main thing to note from this types file is the `TransparentNote` definition. This defines how the contract moves value from the public domain into the private domain. It is similar to the `value_note` that we imported, but with some modifications namely, instead of a defined `owner`, it allows anyone that can produce the pre-image to the stored `secret_hash` to spend the note.
 
@@ -476,6 +476,13 @@ This must be included in every contract because it depends on the storage slots,
 
 #include_code compute_note_hash_and_nullifier /yarn-project/noir-contracts/src/contracts/token_contract/src/main.nr rust
 
+:::danger
+If your contract works with storage (has Storage struct defined), you **MUST** include a `compute_note_hash_and_nullifier` function.
+If you don't yet have any private state variables defined put there a placeholder function:
+
+#include_code compute_note_hash_and_nullifier_placeholder /yarn-project/noir-contracts/src/contracts/token_bridge_contract/src/main.nr rust
+:::
+
 ## Compiling
 
 Now that the contract is complete, you should be able to compile it with the `aztec-cli`. See the [CLI page](../cli/main.md) for instructions on setting it up.
diff --git a/yarn-project/noir-contracts/src/contracts/token_bridge_contract/src/main.nr b/yarn-project/noir-contracts/src/contracts/token_bridge_contract/src/main.nr
index 5709aab6aec..b87a5d843e8 100644
--- a/yarn-project/noir-contracts/src/contracts/token_bridge_contract/src/main.nr
+++ b/yarn-project/noir-contracts/src/contracts/token_bridge_contract/src/main.nr
@@ -181,7 +181,9 @@ contract TokenBridge {
     // docs:end:assert_token_is_same
 
     // TODO: remove this placeholder once https://github.com/AztecProtocol/aztec-packages/issues/2918 is implemented
+    // docs:start:compute_note_hash_and_nullifier_placeholder
     unconstrained fn compute_note_hash_and_nullifier(contract_address: Field, nonce: Field, storage_slot: Field, preimage: [Field; 0]) -> [Field; 4] {
         [0, 0, 0, 0]
     }
+    // docs:end:compute_note_hash_and_nullifier_placeholder
 }