diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index 49624a2a93d..744190c0542 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -633,11 +633,11 @@ void namcos2_state::dpram_word_w(offs_t offset, uint16_t data, uint16_t mem_mask
 		m_dpram[offset] = data&0xff;
 
 		// TODO : This is a hack! should be output ports MCU side, not probing into DPRAM content
-		if( m_gametype==NAMCOS2_GOLLY_GHOST )
+		if( ( m_gametype == NAMCOS2_GOLLY_GHOST) || (m_gametype == NAMCOS2_BUBBLE_TROUBLE ) )
 		{
 			switch( offset )
 			{
-			case 0xc0/2: GollyGhostUpdateDiorama_c0(data); break;
+			case 0xc0/2: if( m_gametype == NAMCOS2_GOLLY_GHOST ) GollyGhostUpdateDiorama_c0(data); break;
 			case 0xc2/2:
 				/* unknown; 0x00 or 0x01 - probably lights up guns */
 			break;