diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
index cc41e42dc5a6..5c4748463577 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
@@ -28,7 +28,7 @@ impl<T> PublicMutable<T> {
 
     // docs:start:public_mutable_struct_read
     pub fn read<T_SERIALIZED_LEN>(self) -> T where T: Deserialize<T_SERIALIZED_LEN> {
-        assert(self.context.private.is_none(), "Public state reads only supported in public functions");
+        assert(self.context.private.is_none(), "PublicMutable reads only supported in public functions");
         let fields = storage_read(self.storage_slot);
         T::deserialize(fields)
     }
@@ -36,7 +36,7 @@ impl<T> PublicMutable<T> {
 
     // docs:start:public_mutable_struct_write
     pub fn write<T_SERIALIZED_LEN>(self, value: T) where T: Serialize<T_SERIALIZED_LEN> {
-        assert(self.context.private.is_none(), "Public state writes only supported in public functions");
+        assert(self.context.private.is_none(), "PublicMutable writes only supported in public functions");
         let fields = T::serialize(value);
         storage_write(self.storage_slot, fields);
     }
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr
index 45705e5e142f..341c83681c1b 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr
@@ -18,7 +18,9 @@ impl<T> SharedImmutable<T> {
         context: Context,
         storage_slot: Field
     ) -> Self {
-        assert(storage_slot != 0, "Storage slot 0 not allowed. Storage slots must start from 1.");
+        assert(
+            (storage_slot != 0) & (storage_slot != 1), "Storage slots 0 and 1 not allowed. Storage slots must start from 2."
+        );
         Self { context, storage_slot }
     }
 
@@ -28,13 +30,17 @@ impl<T> SharedImmutable<T> {
             self.context.private.is_none(), "SharedImmutable can only be initialized from public functions"
         );
         self.context.public.unwrap_unchecked().assert_deployment();
-        // TODO: Must throw if the storage slot is not empty -> cannot allow overwriting
-        // This is currently impractical, as public functions are never marked `is_contract_deployment`
-        // in the `call_context`, only private functions will have this flag set.
-        let fields = T::serialize(value);
-        // TODO(benesjan): check here that the value is not already set
-        // storage_write(self.storage_slot, 0xdead);
-        storage_write(self.storage_slot, fields);
+
+        // We check that the struct is not yet initialized by checking if the placeholder slot is 0
+        let placeholder_storage_slot = self.storage_slot - 1;
+        let fields_read: [Field; 1] = storage_read(placeholder_storage_slot);
+        assert(fields_read[0] != 0, "SharedImmutable already initialized");
+
+        // We populate the placeholder slot with a non-zero value to indicate that the struct is initialized
+        storage_write(placeholder_storage_slot, [0xdead]);
+
+        let fields_write = T::serialize(value);
+        storage_write(self.storage_slot, fields_write);
     }
 
     pub fn read_public<T_SERIALIZED_LEN>(self) -> T where T: Deserialize<T_SERIALIZED_LEN> {