diff --git a/src/libstrongswan/processing/watcher.c b/src/libstrongswan/processing/watcher.c
index fd1c2354c..7b2c2058b 100644
--- a/src/libstrongswan/processing/watcher.c
+++ b/src/libstrongswan/processing/watcher.c
@@ -561,12 +561,12 @@ METHOD(watcher_t, add, void,
 METHOD(watcher_t, remove_, void,
 	private_watcher_t *this, int fd)
 {
-	entry_t *entry, *prev = NULL;
 	watcher_event_t found = 0;
 
 	this->mutex->lock(this->mutex);
 	while (TRUE)
 	{
+		entry_t *entry, *prev = NULL;
 		bool is_in_callback = FALSE;
 
 		entry = this->fds;