diff --git a/src/main/aerospike/aerospike_query.c b/src/main/aerospike/aerospike_query.c
index dd8c28b45..7f01f519e 100644
--- a/src/main/aerospike/aerospike_query.c
+++ b/src/main/aerospike/aerospike_query.c
@@ -873,11 +873,9 @@ as_query_command_init(
 			write_attr |= AS_MSG_INFO2_RELAX_AP_LONG_QUERY;
 		}
 
-		uint8_t info_attr = qb->is_new ? AS_MSG_INFO3_PARTITION_DONE : 0;
-
 		p = as_command_write_header_read(cmd, base_policy, AS_POLICY_READ_MODE_AP_ONE,
 			AS_POLICY_READ_MODE_SC_SESSION, -1, base_policy->total_timeout, qb->n_fields, qb->n_ops,
-			read_attr, write_attr, info_attr);
+			read_attr, write_attr, AS_MSG_INFO3_PARTITION_DONE);
 	}
 	else if (query->ops) {
 		// Background query with operations.
diff --git a/src/main/aerospike/aerospike_scan.c b/src/main/aerospike/aerospike_scan.c
index c6520548e..dbc0cf6f5 100644
--- a/src/main/aerospike/aerospike_scan.c
+++ b/src/main/aerospike/aerospike_scan.c
@@ -525,12 +525,9 @@ as_scan_command_init(
 			read_attr |= AS_MSG_INFO1_GET_NOBINDATA;
 		}
 
-		// Clusters that support partition queries also support not sending partition done messages.
-		int info_attr = cluster->has_partition_query? AS_MSG_INFO3_PARTITION_DONE : 0;
-
 		p = as_command_write_header_read(cmd, &policy->base, AS_POLICY_READ_MODE_AP_ONE,
 				AS_POLICY_READ_MODE_SC_SESSION, -1, policy->base.total_timeout, sb->n_fields, n_ops,
-				read_attr, 0, info_attr);
+				read_attr, 0, AS_MSG_INFO3_PARTITION_DONE);
 	}
 	
 	if (scan->ns[0]) {