diff --git a/src/devices/cpu/z80/z80.lst b/src/devices/cpu/z80/z80.lst
index 3a2efed57f2..567e9b34940 100644
--- a/src/devices/cpu/z80/z80.lst
+++ b/src/devices/cpu/z80/z80.lst
@@ -679,7 +679,7 @@ ffff
 		}
 		if (m_icount > 0)
 			m_icount = 0;
-		goto leave;
+		return;
 	} else if (m_busack_state) {
 		m_busack_state = 0;
 		m_busack_cb(0);
diff --git a/src/devices/cpu/z80/z80make.py b/src/devices/cpu/z80/z80make.py
index 51e4214e1e9..4100cc6b17e 100644
--- a/src/devices/cpu/z80/z80make.py
+++ b/src/devices/cpu/z80/z80make.py
@@ -74,7 +74,7 @@ class Opcode:
                 to_step = "0x%s" % (hex(256 + step)[3:])
                 il.print("if (m_icount <= 0) {", f)
                 il.print("	m_ref = (m_ref & 0xffff00) | %s;" % (to_step), f)
-                il.print("	goto leave;", f)
+                il.print("	return;", f)
                 il.print("}", f)
                 il.print("[[fallthrough]];", f)
                 print("\t\tcase %s:" % (to_step), file=f)
@@ -92,7 +92,7 @@ class Opcode:
                 step += 1
                 to_step = "0x%s" % (hex(256 + step)[3:])
                 il.print("		m_ref = (m_ref & 0xffff00) | %s;" % (to_step), f)
-                il.print("	goto leave;", f)
+                il.print("	return;", f)
                 il.print("}", f)
                 il.print("[[fallthrough]];", f)
                 print("\t\tcase %s:" % (to_step), file=f)
@@ -223,7 +223,7 @@ class OpcodeList:
         print("if (m_wait_state)", file=f)
         print("{", file=f)
         print("	m_icount = 0; // stalled", file=f)
-        print("	goto leave;", file=f)
+        print("	return;", file=f)
         print("}", file=f)
         print("start:", file=f)
         print("switch (u8(m_ref >> 16)) // prefix", file=f)
@@ -256,7 +256,6 @@ class OpcodeList:
         print("", file=f)
         print("m_ref = 0xffff00;", file=f)
         print("goto rop;", file=f)
-        print("leave: ;", file=f)
 
 def main(argv):
     if len(argv) != 3 and len(argv) != 4: