diff --git a/src/ContinuousAO.cpp b/src/ContinuousAO.cpp
index 8cc2d5a54a6e0162cfb743cbd316449a7af1c255..776d4ed23e8b9452ecc55c78f4701874d245e6ad 100644
--- a/src/ContinuousAO.cpp
+++ b/src/ContinuousAO.cpp
@@ -1447,6 +1447,8 @@ void ContinuousAO::save_waveform(double* waveform, string wfm_channel)
   Tango::DbData db_data;
   db_data.push_back(dbdatum);
   
+  get_db_device()->set_timeout_millis(30000);
+
   // put the waveform in the database 
   _DEV_TRY
     (