diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index a9ec68cda6..fd23c608a0 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -131,10 +131,10 @@ static void context_reset_timer(Context *context) {
 }
 
 static void connection_release(Connection *c) {
-        assert(c);
+        Context *context = ASSERT_PTR(ASSERT_PTR(c)->context);
 
         connection_free(c);
-        context_reset_timer(c->context);
+        context_reset_timer(context);
 }
 
 static int connection_create_pipes(Connection *c, int buffer[static 2], size_t *sz) {