diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index a8494abf..4f92b508 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -28,6 +28,7 @@ class InfocenterState : public LegoState {
 	// FUNCTION: LEGO1 0x10071830
 	virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
 
+	inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
 	inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
 	inline MxU32 GetUnknown0x74() { return m_unk0x74; }
 
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 8c51cd2d..68090a69 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -58,7 +58,7 @@ Infocenter::~Infocenter()
 			m_infocenterState->GetInfocenterBufferElement(i)->Enable(FALSE);
 		}
 		i++;
-	} while (i < 7);
+	} while (i < m_infocenterState->GetInfocenterBufferSize());
 
 	ControlManager()->Unregister(this);