diff --git a/Alc/hrtf.c b/Alc/hrtf.c
index 3017113d..9e401573 100644
--- a/Alc/hrtf.c
+++ b/Alc/hrtf.c
@@ -284,8 +284,10 @@ ALsizei BuildBFormatHrtf(const struct Hrtf *Hrtf, DirectHrtfState *state, ALsize
             }
         }
     }
-    TRACE("Skipped min delay: %d, new combined length: %d\n", min_delay, max_length);
+    /* Round up to the next IR size multiple. */
+    max_length = RoundUp(max_length, MOD_IR_SIZE);
 
+    TRACE("Skipped min delay: %d, new combined length: %d\n", min_delay, max_length);
     return max_length;
 #undef NUM_BANDS
 }
diff --git a/Alc/panning.c b/Alc/panning.c
index c00421c9..a5cddcb2 100644
--- a/Alc/panning.c
+++ b/Alc/panning.c
@@ -963,9 +963,6 @@ static void InitHrtfPanning(ALCdevice *device)
         device->Hrtf, device->Dry.NumChannels,
         AmbiPoints, AmbiMatrix, COUNTOF(AmbiPoints)
     );
-
-    /* Round up to the nearest multiple of 8 */
-    device->Hrtf->IrSize = (device->Hrtf->IrSize+7)&~7;
 }
 
 static void InitUhjPanning(ALCdevice *device)