diff --git a/convert-hf-to-gguf.py b/convert-hf-to-gguf.py
index 9f4094194..2bf0967ce 100755
--- a/convert-hf-to-gguf.py
+++ b/convert-hf-to-gguf.py
@@ -301,12 +301,16 @@ class Model:
                 if self.ftype != gguf.LlamaFileType.ALL_F32 and extra_f16 and not extra_f32:
                     # TODO: cleaner model-specific per-tensor types
                     # NOTE: Q1_3 is only relevant for BitNet 1.58b
-                    if self.ftype == gguf.LlamaFileType.MOSTLY_Q1_3 and not any(
-                        self.match_model_tensor_name(new_name, key, None)
-                        for key in [
-                            gguf.MODEL_TENSOR.TOKEN_EMBD,
-                            gguf.MODEL_TENSOR.OUTPUT,
-                        ]
+                    if (
+                        self.ftype == gguf.LlamaFileType.MOSTLY_Q1_3
+                        and gguf.can_quantize_to_q1_3(data)
+                        and not any(
+                            self.match_model_tensor_name(new_name, key, None)
+                            for key in [
+                                gguf.MODEL_TENSOR.TOKEN_EMBD,
+                                gguf.MODEL_TENSOR.OUTPUT,
+                            ]
+                        )
                     ):
                         data = gguf.quantize_q1_3(data)
                         assert data.dtype == np.uint8
diff --git a/gguf-py/gguf/quants.py b/gguf-py/gguf/quants.py
index c66b83b3f..c96e6a343 100644
--- a/gguf-py/gguf/quants.py
+++ b/gguf-py/gguf/quants.py
@@ -126,6 +126,10 @@ def quantize_q8_0(data: np.ndarray):
 __q1_3_block_size, __q1_3_type_size = GGML_QUANT_SIZES[GGMLQuantizationType.Q1_3]
 
 
+def can_quantize_to_q1_3(n: np.ndarray) -> bool:
+    return n.shape[-1] % __q1_3_block_size == 0
+
+
 def __quantize_q1_3_shape_change(s: tuple[int, ...]) -> tuple[int, ...]:
     return (*s[:-1], s[-1] // __q1_3_block_size * __q1_3_type_size)