diff --git a/src/mess/includes/kaypro.h b/src/mess/includes/kaypro.h
index 00e26dbd2e8..a3c0b7062e9 100644
--- a/src/mess/includes/kaypro.h
+++ b/src/mess/includes/kaypro.h
@@ -73,10 +73,7 @@ public:
 	UINT8 m_mc6845_cursor[16];
 	UINT8 m_mc6845_reg[32];
 	UINT8 m_mc6845_ind;
-	UINT8 m_speed;
-	UINT8 m_flash;
 	UINT8 m_framecnt;
-	UINT16 m_cursor;
 	UINT8 *m_p_videoram;
 	kay_kbd_t *m_kbd;
 	int m_centronics_busy;
diff --git a/src/mess/video/kaypro.c b/src/mess/video/kaypro.c
index 6e97b80853f..8e415498cd5 100644
--- a/src/mess/video/kaypro.c
+++ b/src/mess/video/kaypro.c
@@ -114,9 +114,6 @@ UINT32 kaypro_state::screen_update_omni2(screen_device &screen, bitmap_ind16 &bi
 UINT32 kaypro_state::screen_update_kaypro2x(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
 	m_framecnt++;
-	m_speed = m_mc6845_reg[10]&0x20;
-	m_flash = m_mc6845_reg[10]&0x40;                // cursor modes
-	m_cursor = (m_mc6845_reg[14]<<8) | m_mc6845_reg[15];                    // get cursor position
 	m_crtc->screen_update(screen, bitmap, cliprect);
 	return 0;
 }
@@ -177,12 +174,9 @@ MC6845_UPDATE_ROW( kaypro2x_update_row )
 		if ( (BIT(attr, 2)) & (BIT(state->m_framecnt, 3)) )
 			fg = bg;
 
-		/* process cursor - remove when mame fixed */
-		if ((((!state->m_flash) && (!state->m_speed)) ||
-			((state->m_flash) && (state->m_speed) && (state->m_framecnt & 0x10)) ||
-			((state->m_flash) && (!state->m_speed) && (state->m_framecnt & 8))) &&
-			(mem == state->m_cursor))
-				inv ^= state->m_mc6845_cursor[ra];
+		/* process cursor */
+		if (x == cursor_x)
+			inv ^= state->m_mc6845_cursor[ra];
 
 		/* get pattern of pixels for that character scanline */
 		if ( (ra == 15) & (BIT(attr, 3)) )  /* underline */