diff --git a/modules/ca/src/client/repeater.cpp b/modules/ca/src/client/repeater.cpp
index 9ccf071e3..832d03b17 100644
--- a/modules/ca/src/client/repeater.cpp
+++ b/modules/ca/src/client/repeater.cpp
@@ -645,6 +645,7 @@ extern "C" void caRepeaterThread ( void * /* pDummy */ )
 {
     taskwdInsert ( epicsThreadGetIdSelf(), NULL, NULL );
     ca_repeater ();
+    taskwdRemove ( 0 );
 }