diff --git a/src/connector.c b/src/connector.c
index 811e20b1..a2dbbf2b 100644
--- a/src/connector.c
+++ b/src/connector.c
@@ -238,7 +238,7 @@ static void stratifier_drop_client(ckpool_t *ckp, int64_t id)
  * count. */
 static int invalidate_client(ckpool_t *ckp, cdata_t *cdata, client_instance_t *client)
 {
-	client_instance_t *tmp, *client_delete = NULL;
+	client_instance_t *tmp;
 	int ret;
 
 	ret = drop_client(cdata, client);
@@ -250,15 +250,12 @@ static int invalidate_client(ckpool_t *ckp, cdata_t *cdata, client_instance_t *c
 	 * counts for them. */
 	ck_wlock(&cdata->lock);
 	LL_FOREACH_SAFE(cdata->dead_clients, client, tmp) {
-		/* Don't free client ram when loop may still access it */
-		dealloc(client_delete);
 		if (!client->ref) {
 			LL_DELETE(cdata->dead_clients, client);
 			LOGINFO("Connector discarding client %ld", client->id);
-			client_delete = client;
+			dealloc(client);
 		}
 	}
-	dealloc(client_delete);
 	ck_wunlock(&cdata->lock);
 
 out:
diff --git a/src/stratifier.c b/src/stratifier.c
index 2cc56239..ca7b57ee 100644
--- a/src/stratifier.c
+++ b/src/stratifier.c
@@ -1250,7 +1250,7 @@ static void dec_worker(ckpool_t *ckp, user_instance_t *instance)
 
 static void drop_client(sdata_t *sdata, int64_t id)
 {
-	stratum_instance_t *client, *tmp, *client_delete = NULL;
+	stratum_instance_t *client, *tmp;
 	user_instance_t *instance = NULL;
 	time_t now_t = time(NULL);
 	ckpool_t *ckp = NULL;
@@ -1304,20 +1304,14 @@ static void drop_client(sdata_t *sdata, int64_t id)
 	/* Cull old unused clients lazily when there are no more reference
 	 * counts for them. */
 	LL_FOREACH_SAFE(sdata->dead_instances, client, tmp) {
-		/* We can't delete the ram safely in this loop, even if we can
-		 * safely remove the entry from the linked list so we do it on
-		 * the next pass through the loop. */
-		if (client != client_delete)
-			dealloc(client_delete);
 		if (!client->ref) {
 			LOGINFO("Stratifier discarding dead instance %ld", client->id);
 			__del_dead(sdata, client);
 			dealloc(client->workername);
 			dealloc(client->useragent);
-			client_delete = client;
+			dealloc(client);
 		}
 	}
-	dealloc(client_delete);
 	ck_wunlock(&sdata->instance_lock);
 
 	/* Decrease worker count outside of instance_lock to avoid recursive