diff --git a/src/biotite/structure/geometry.py b/src/biotite/structure/geometry.py
index 32453deb8..900b13fdb 100644
--- a/src/biotite/structure/geometry.py
+++ b/src/biotite/structure/geometry.py
@@ -60,6 +60,14 @@
     NDArray3,
 )
 
+# Bond length range (in Angstrom) used to decide whether two positionally
+# adjacent residues are actually connected via a peptide (C-N) or
+# phosphodiester (O3'-P) bond.
+# Mirrors the defaults of `filter_linear_bond_continuity()` /
+# `check_backbone_continuity()` in `biotite.structure.integrity`.
+_BACKBONE_BOND_LENGTH_MIN = 1.2
+_BACKBONE_BOND_LENGTH_MAX = 1.8
+
 # The names of the atoms participating in chi angle
 _CHI_ATOMS = {
     "ARG": [
@@ -647,6 +655,9 @@ def dihedral_backbone(
         `phi` is not defined at the N-terminus, `psi` and `omega` are not defined at the
         C-terminus.
         In these places the arrays have *NaN* values.
+        The same is true if two consecutive residues are not actually connected,
+        e.g. due to a chain break or missing loop, as indicated by an implausible
+        C-N bond length.
         If an :class:`AtomArrayStack` is given, the output angles are 2-dimensional,
         the first dimension corresponds to the model number.
     """
@@ -690,9 +701,29 @@ def dihedral_backbone(
     coord_for_omg[..., 0:-1, :, 3] = coord_ca[..., 1:,   :]
     # fmt: on
 
-    phi = dihedral(*(coord_for_phi[..., i] for i in range(4)))
-    psi = dihedral(*(coord_for_psi[..., i] for i in range(4)))
-    omg = dihedral(*(coord_for_omg[..., i] for i in range(4)))
+    # `np.asarray` strips the unreachable scalar (`np.floating`) branch of
+    # `dihedral`'s return type (see the note on the return statement below),
+    # so the in-place NaN masking further down type-checks.
+    phi = np.asarray(dihedral(*(coord_for_phi[..., i] for i in range(4))))
+    psi = np.asarray(dihedral(*(coord_for_psi[..., i] for i in range(4))))
+    omg = np.asarray(dihedral(*(coord_for_omg[..., i] for i in range(4))))
+
+    # Two residues that are merely positionally adjacent in the atom array
+    # (e.g. due to a missing loop or concatenated chains) are not
+    # necessarily bonded to each other.
+    # Hence, the C-N distance between them is checked to only compute
+    # dihedral angles for backbone atoms that are actually connected.
+    c_n_dist = np.linalg.norm(coord_c[..., :-1, :] - coord_n[..., 1:, :], axis=-1)
+    is_discontinuous = ~(
+        (c_n_dist >= _BACKBONE_BOND_LENGTH_MIN)
+        & (c_n_dist <= _BACKBONE_BOND_LENGTH_MAX)
+    )
+    # `psi` and `omega` of residue `i` as well as `phi` of residue `i + 1`
+    # are defined using atoms from both sides of the junction between
+    # residue `i` and `i + 1`
+    psi[..., :-1][is_discontinuous] = np.nan
+    omg[..., :-1][is_discontinuous] = np.nan
+    phi[..., 1:][is_discontinuous] = np.nan
 
     # `dihedral`'s union return includes a scalar `np.floating` branch
     # that only fires on rank-0 inputs; here the inputs are always at
@@ -851,6 +882,9 @@ def nucleotide_dihedral_backbone(
         :math:`\alpha` is not defined at the 5'-terminus, :math:`\epsilon` and
         :math:`\zeta` are not defined at the 3'-terminus.
         In these places the arrays have *NaN* values.
+        The same is true if two consecutive residues are not actually connected,
+        e.g. due to a chain break or missing residues, as indicated by an
+        implausible O3'-P bond length.
         If an :class:`AtomArrayStack` is given, the output angles are 2-dimensional,
         the first dimension corresponds to the model number.
 
@@ -925,12 +959,33 @@ def nucleotide_dihedral_backbone(
     coord_for_zeta[..., 0:-1, :, 3] = coord_o5p[...,   1:, :]
     # fmt: on
 
-    alpha = dihedral(*(coord_for_alpha[..., i] for i in range(4)))
+    # `alpha`, `epsilon` and `zeta` are wrapped in `np.asarray` to strip the
+    # unreachable scalar (`np.floating`) branch of `dihedral`'s return type
+    # (see the note on the return statement below), so the in-place NaN
+    # masking further down type-checks.
+    alpha = np.asarray(dihedral(*(coord_for_alpha[..., i] for i in range(4))))
     beta = dihedral(*(coord_for_beta[..., i] for i in range(4)))
     gamma = dihedral(*(coord_for_gamma[..., i] for i in range(4)))
     delta = dihedral(*(coord_for_delta[..., i] for i in range(4)))
-    epsilon = dihedral(*(coord_for_epsilon[..., i] for i in range(4)))
-    zeta = dihedral(*(coord_for_zeta[..., i] for i in range(4)))
+    epsilon = np.asarray(dihedral(*(coord_for_epsilon[..., i] for i in range(4))))
+    zeta = np.asarray(dihedral(*(coord_for_zeta[..., i] for i in range(4))))
+
+    # Two residues that are merely positionally adjacent in the atom array
+    # (e.g. due to a missing loop or concatenated chains) are not
+    # necessarily bonded to each other.
+    # Hence, the O3'-P distance between them is checked to only compute
+    # dihedral angles for backbone atoms that are actually connected.
+    o3p_p_dist = np.linalg.norm(coord_o3p[..., :-1, :] - coord_p[..., 1:, :], axis=-1)
+    is_discontinuous = ~(
+        (o3p_p_dist >= _BACKBONE_BOND_LENGTH_MIN)
+        & (o3p_p_dist <= _BACKBONE_BOND_LENGTH_MAX)
+    )
+    # `epsilon` and `zeta` of residue `i` as well as `alpha` of residue
+    # `i + 1` are defined using atoms from both sides of the junction
+    # between residue `i` and `i + 1`
+    epsilon[..., :-1][is_discontinuous] = np.nan
+    zeta[..., :-1][is_discontinuous] = np.nan
+    alpha[..., 1:][is_discontinuous] = np.nan
 
     # See note in `dihedral_backbone` about the scalar branch of
     # `dihedral`'s return type being unreachable here.
diff --git a/tests/structure/test_geometry.py b/tests/structure/test_geometry.py
index 46f47e4be..05cc5419a 100644
--- a/tests/structure/test_geometry.py
+++ b/tests/structure/test_geometry.py
@@ -98,6 +98,69 @@ def test_dihedral_backbone_consistency(multi_model):
     assert test_ome == pytest.approx(ref_omega, abs=1e-3, nan_ok=True)
 
 
+@pytest.mark.parametrize("multi_model", [False, True])
+@pytest.mark.parametrize(
+    "function_name", ["dihedral_backbone", "nucleotide_dihedral_backbone"]
+)
+def test_dihedral_backbone_chain_break(function_name, multi_model):
+    """
+    :func:`dihedral_backbone()` and :func:`nucleotide_dihedral_backbone()`
+    must not compute dihedral angles across a chain break, i.e. two
+    residues that are positionally adjacent in the :class:`AtomArray` but
+    not actually bonded.
+    This is simulated by taking two unrelated fragments of the same chain
+    and translating one of them far away, while keeping the residue IDs
+    perfectly continuous, to ensure the detection is based on the actual
+    bond distance and not on residue numbering.
+    """
+    if function_name == "dihedral_backbone":
+        pdb_id = "1l2y"
+        angle_names = ["phi", "psi", "omega"]
+        # The angles reaching into the following residue and the angle
+        # reaching back into the preceding one
+        trailing_names = ["psi", "omega"]
+        leading_name = "phi"
+    else:
+        pdb_id = "4p5j"
+        angle_names = ["alpha", "beta", "gamma", "delta", "epsilon", "zeta"]
+        trailing_names = ["epsilon", "zeta"]
+        leading_name = "alpha"
+
+    pdbx_file = pdbx.BinaryCIFFile.read(
+        data_dir("structure") / "pdb" / f"{pdb_id}.bcif"
+    )
+    atoms = pdbx.get_structure(pdbx_file, model=1)
+    if function_name == "nucleotide_dihedral_backbone":
+        atoms = atoms[struc.filter_canonical_nucleotides(atoms)]
+
+    fragment_1 = atoms[np.isin(atoms.res_id, [1, 2])].copy()
+    fragment_2 = atoms[np.isin(atoms.res_id, [15, 16])].copy()
+    # Renumber so residue IDs are contiguous with `fragment_1`, although
+    # the two fragments are not physically connected
+    fragment_2.res_id = fragment_2.res_id - 15 + 3
+    fragment_2.coord = fragment_2.coord + np.array([1000, 0, 0], dtype=np.float32)
+    combined = fragment_1 + fragment_2
+    if multi_model:
+        combined = struc.stack([combined] * 2)
+
+    angles = dict(
+        zip(angle_names, getattr(struc, function_name)(combined), strict=True)
+    )
+
+    # The junction between residue index 1 (res_id 2) and residue index 2
+    # (res_id 3) is not an actual bond -> angles spanning it must be NaN
+    for name in trailing_names:
+        assert np.all(np.isnan(angles[name][..., 1]))
+    assert np.all(np.isnan(angles[leading_name][..., 2]))
+    # All other angles within a fragment are unaffected and must remain
+    # finite
+    for name in trailing_names:
+        assert np.all(np.isfinite(angles[name][..., 0]))
+        assert np.all(np.isfinite(angles[name][..., 2]))
+    assert np.all(np.isfinite(angles[leading_name][..., 1]))
+    assert np.all(np.isfinite(angles[leading_name][..., 3]))
+
+
 @pytest.mark.parametrize("multi_model", [False, True])
 def test_dihedral_side_chain_consistency(multi_model):
     """