diff --git a/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp b/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
index 4a9b5c5af6..befa138729 100644
--- a/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
+++ b/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
@@ -693,10 +693,12 @@ DwarfImageDebugInfo::GetStatement(FunctionDebugInfo* _function,
 	int32 statementLine = -1;
 	int32 statementColumn = -1;
 	while (program.GetNextRow(state)) {
-		bool isOurFile = state.file == fileIndex;
+		// skip statements of other files
+		if (state.file != fileIndex)
+			continue;
 
 		if (statementAddress != 0
-			&& (!isOurFile || state.isStatement || state.isSequenceEnd)) {
+			&& (state.isStatement || state.isSequenceEnd)) {
 			target_addr_t endAddress = state.address;
 			if (address >= statementAddress && address < endAddress) {
 				ContiguousStatement* statement = new(std::nothrow)
@@ -714,10 +716,6 @@ DwarfImageDebugInfo::GetStatement(FunctionDebugInfo* _function,
 			statementAddress = 0;
 		}
 
-		// skip statements of other files
-		if (!isOurFile)
-			continue;
-
 		if (state.isStatement) {
 			statementAddress = state.address;
 			statementLine = state.line - 1;