diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/maker/LoopRegionMaker.java b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/maker/LoopRegionMaker.java
index d1d31061b..1812c0f60 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/maker/LoopRegionMaker.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/maker/LoopRegionMaker.java
@@ -24,6 +24,7 @@ import jadx.core.dex.trycatch.ExceptionHandler;
 import jadx.core.utils.BlockUtils;
 import jadx.core.utils.ListUtils;
 import jadx.core.utils.RegionUtils;
+import jadx.core.utils.blocks.BlockSet;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
 import static jadx.core.utils.BlockUtils.getNextBlock;
@@ -349,7 +350,12 @@ final class LoopRegionMaker {
 
 		if (!confirm) {
 			BlockNode insertBlock = null;
-			while (exit != null) {
+			BlockSet visited = new BlockSet(mth);
+			while (true) {
+				if (exit == null || visited.contains(exit)) {
+					break;
+				}
+				visited.add(exit);
 				if (insertBlock != null && isPathExists(loopExit, exit)) {
 					// found cross
 					if (canInsertBreak(insertBlock)) {
diff --git a/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java b/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
index c761967a1..6e491bc45 100644
--- a/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
+++ b/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
@@ -599,7 +599,11 @@ public class BlockUtils {
 			if (s == until) {
 				return true;
 			}
-			int id = s.getId();
+			if (s == from) {
+				// ignore possible block self loop
+				continue;
+			}
+			int id = s.getPos();
 			if (!visited.get(id)) {
 				visited.set(id);
 				if (until.isDominator(s)) {