diff --git a/scripts/policy/protocols/smb/smb2-main.bro b/scripts/policy/protocols/smb/smb2-main.bro
index 8cd7b58574..31b3abf0db 100644
--- a/scripts/policy/protocols/smb/smb2-main.bro
+++ b/scripts/policy/protocols/smb/smb2-main.bro
@@ -14,7 +14,9 @@ event smb2_message(c: connection, hdr: SMB2::Header, is_orig: bool) &priority=5
 		local state: SMB::State;
 		state$fid_map = table();
 		state$tid_map = table();
+		state$uid_map = table();
 		state$pending_cmds = table();
+		state$pipe_map = table();
 		c$smb_state = state;
 		}