diff --git a/ChangeLog b/ChangeLog
index f80853a31c..e1e353d7ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-10  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/audioscale/gstaudioscale.c: (gst_audioscale_chain):
+	  Don't crash, biatch! :).
+
 2005-01-10  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/musepack/gstmusepackreader.cpp:
diff --git a/gst/audioscale/gstaudioscale.c b/gst/audioscale/gstaudioscale.c
index 5c9a12d6c7..220d6b3750 100644
--- a/gst/audioscale/gstaudioscale.c
+++ b/gst/audioscale/gstaudioscale.c
@@ -597,7 +597,7 @@ gst_audioscale_chain (GstPad * pad, GstData * _data)
         break;
     }
     return;
-  } else if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
+  } else if (GST_BUFFER_TIMESTAMP_IS_VALID (buf) && audioscale->gst_resample) {
     /* update time for out-sample */
     audioscale->gst_resample_offset = GST_BUFFER_TIMESTAMP (buf) *
         audioscale->gst_resample->o_rate / GST_SECOND;