diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java
index 0ee5a319a6..50b5c8f209 100644
--- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java
+++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java
@@ -30,6 +30,9 @@
  * @author gavalian
  */
 public class CLASDecoder {
+       
+    // truncate EVIO waveforms longer than this:
+    final static int MAX_BANK_WF_LENGTH = 30;
 
     protected DetectorEventDecoder detectorDecoder = null;
     protected SchemaFactory           schemaFactory = new SchemaFactory();
@@ -203,7 +206,7 @@ public Bank getDataBankWF(String name, DetectorType type) {
             b.putLong( 4, i, a.get(i).getADCData(0).getTimeStamp());
             b.putInt("time", i, (int)a.get(i).getADCData(0).getTime());
             DetectorDataDgtz.ADCData xxx = a.get(i).getADCData(0);
-            for (int j=0; j<xxx.getPulseSize(); ++j)
+            for (int j=0; j<xxx.getPulseSize() && j<MAX_BANK_WF_LENGTH; ++j)
                 b.putShort(j+5, i, xxx.getPulseValue(j));
         }
         return b;