diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py
index c2ceb5d8007..dfee4ea3b93 100644
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -1744,6 +1744,16 @@ optimizations.extend([
    (('ibfe', a,  0, 16), ('extract_i16', a, 0), '!options->lower_extract_word'),
    (('ibfe', a, 16, 16), ('extract_i16', a, 1), '!options->lower_extract_word'),
 
+   # Collapse nop packing.
+   (('unpack_32_4x8', ('pack_32_4x8', a)), a),
+   (('unpack_32_2x16', ('pack_32_2x16', a)), a),
+   (('unpack_64_4x16', ('pack_64_4x16', a)), a),
+   (('unpack_64_2x32', ('pack_64_2x32', a)), a),
+   (('pack_32_4x8', ('unpack_32_4x8', a)), a),
+   (('pack_32_2x16', ('unpack_32_2x16', a)), a),
+   (('pack_64_4x16', ('unpack_64_4x16', a)), a),
+   (('pack_64_2x32', ('unpack_64_2x32', a)), a),
+
    # Packing a u8vec4 to write to an SSBO.
    (('ior', ('ishl', ('u2u32', 'a@8'), 24), ('ior', ('ishl', ('u2u32', 'b@8'), 16), ('ior', ('ishl', ('u2u32', 'c@8'), 8), ('u2u32', 'd@8')))),
     ('pack_32_4x8', ('vec4', d, c, b, a)), 'options->has_pack_32_4x8'),