diff --git a/src/libstrongswan/networking/streams/stream_service.c b/src/libstrongswan/networking/streams/stream_service.c
index 7f69c85d3..5b709a224 100644
--- a/src/libstrongswan/networking/streams/stream_service.c
+++ b/src/libstrongswan/networking/streams/stream_service.c
@@ -226,6 +226,10 @@ static bool watch(private_stream_service_t *this, int fd, watcher_event_t event)
 	}
 	else
 	{
+		if (data->fd != -1)
+		{
+			close(data->fd);
+		}
 		free(data);
 	}
 	return keep;