diff --git a/tsl/src/remote/cursor_fetcher.c b/tsl/src/remote/cursor_fetcher.c
index c6cf2f00f..754be01ec 100644
--- a/tsl/src/remote/cursor_fetcher.c
+++ b/tsl/src/remote/cursor_fetcher.c
@@ -371,10 +371,9 @@ cursor_fetcher_rewind(DataFetcher *df)
 	{
 		char sql[64];
 
-		Assert(cursor->state.eof || cursor->state.data_req != NULL);
-
-		if (!cursor->state.eof)
+		if (!cursor->state.eof && cursor->state.data_req != NULL)
 			async_request_discard_response(cursor->state.data_req);
+
 		/* We are beyond the first fetch, so need to rewind the remote end */
 		snprintf(sql, sizeof(sql), "MOVE BACKWARD ALL IN c%u", cursor->id);
 		remote_cursor_exec_cmd(cursor, sql);
diff --git a/tsl/test/shared/expected/dist_fetcher_type-12.out b/tsl/test/shared/expected/dist_fetcher_type-12.out
index a791304c2..c20f3624c 100644
--- a/tsl/test/shared/expected/dist_fetcher_type-12.out
+++ b/tsl/test/shared/expected/dist_fetcher_type-12.out
@@ -285,3 +285,19 @@ SELECT * FROM metrics_dist ORDER BY time, device_id LIMIT 11;
  Fri Dec 31 16:04:00 1999 PST |         1 |  2 |  3 | 1.5 |   
 (11 rows)
 
+-- Verify that cursor fetcher can be rewind before EOF due to an
+-- intermediate JOIN product reaching LIMIT
+SET timescaledb.remote_data_fetcher = 'cursor';
+SELECT * FROM metrics_dist as m
+WHERE EXISTS
+    (SELECT *
+     FROM (SELECT m.time as t
+           FROM metrics_dist a INNER JOIN devices b
+                ON a.device_id = b.device_id
+           LIMIT 50) as subq
+     WHERE subq.t is NULL)
+LIMIT 1;
+ time | device_id | v0 | v1 | v2 | v3 
+------+-----------+----+----+----+----
+(0 rows)
+
diff --git a/tsl/test/shared/expected/dist_fetcher_type-13.out b/tsl/test/shared/expected/dist_fetcher_type-13.out
index a791304c2..c20f3624c 100644
--- a/tsl/test/shared/expected/dist_fetcher_type-13.out
+++ b/tsl/test/shared/expected/dist_fetcher_type-13.out
@@ -285,3 +285,19 @@ SELECT * FROM metrics_dist ORDER BY time, device_id LIMIT 11;
  Fri Dec 31 16:04:00 1999 PST |         1 |  2 |  3 | 1.5 |   
 (11 rows)
 
+-- Verify that cursor fetcher can be rewind before EOF due to an
+-- intermediate JOIN product reaching LIMIT
+SET timescaledb.remote_data_fetcher = 'cursor';
+SELECT * FROM metrics_dist as m
+WHERE EXISTS
+    (SELECT *
+     FROM (SELECT m.time as t
+           FROM metrics_dist a INNER JOIN devices b
+                ON a.device_id = b.device_id
+           LIMIT 50) as subq
+     WHERE subq.t is NULL)
+LIMIT 1;
+ time | device_id | v0 | v1 | v2 | v3 
+------+-----------+----+----+----+----
+(0 rows)
+
diff --git a/tsl/test/shared/expected/dist_fetcher_type-14.out b/tsl/test/shared/expected/dist_fetcher_type-14.out
index a791304c2..c20f3624c 100644
--- a/tsl/test/shared/expected/dist_fetcher_type-14.out
+++ b/tsl/test/shared/expected/dist_fetcher_type-14.out
@@ -285,3 +285,19 @@ SELECT * FROM metrics_dist ORDER BY time, device_id LIMIT 11;
  Fri Dec 31 16:04:00 1999 PST |         1 |  2 |  3 | 1.5 |   
 (11 rows)
 
+-- Verify that cursor fetcher can be rewind before EOF due to an
+-- intermediate JOIN product reaching LIMIT
+SET timescaledb.remote_data_fetcher = 'cursor';
+SELECT * FROM metrics_dist as m
+WHERE EXISTS
+    (SELECT *
+     FROM (SELECT m.time as t
+           FROM metrics_dist a INNER JOIN devices b
+                ON a.device_id = b.device_id
+           LIMIT 50) as subq
+     WHERE subq.t is NULL)
+LIMIT 1;
+ time | device_id | v0 | v1 | v2 | v3 
+------+-----------+----+----+----+----
+(0 rows)
+
diff --git a/tsl/test/shared/expected/dist_fetcher_type-15.out b/tsl/test/shared/expected/dist_fetcher_type-15.out
index 5805847f3..b1e353ff6 100644
--- a/tsl/test/shared/expected/dist_fetcher_type-15.out
+++ b/tsl/test/shared/expected/dist_fetcher_type-15.out
@@ -286,3 +286,19 @@ SELECT * FROM metrics_dist ORDER BY time, device_id LIMIT 11;
  Fri Dec 31 16:04:00 1999 PST |         1 |  2 |  3 | 1.5 |   
 (11 rows)
 
+-- Verify that cursor fetcher can be rewind before EOF due to an
+-- intermediate JOIN product reaching LIMIT
+SET timescaledb.remote_data_fetcher = 'cursor';
+SELECT * FROM metrics_dist as m
+WHERE EXISTS
+    (SELECT *
+     FROM (SELECT m.time as t
+           FROM metrics_dist a INNER JOIN devices b
+                ON a.device_id = b.device_id
+           LIMIT 50) as subq
+     WHERE subq.t is NULL)
+LIMIT 1;
+ time | device_id | v0 | v1 | v2 | v3 
+------+-----------+----+----+----+----
+(0 rows)
+
diff --git a/tsl/test/shared/sql/dist_fetcher_type.sql.in b/tsl/test/shared/sql/dist_fetcher_type.sql.in
index ec5c375b0..932b37c51 100644
--- a/tsl/test/shared/sql/dist_fetcher_type.sql.in
+++ b/tsl/test/shared/sql/dist_fetcher_type.sql.in
@@ -177,3 +177,16 @@ ORDER BY 1 DESC LIMIT 1;
 -- Test copy fetcher when query is aborted before EOF due to LIMIT
 SET timescaledb.remote_data_fetcher = 'copy';
 SELECT * FROM metrics_dist ORDER BY time, device_id LIMIT 11;
+
+-- Verify that cursor fetcher can be rewind before EOF due to an
+-- intermediate JOIN product reaching LIMIT
+SET timescaledb.remote_data_fetcher = 'cursor';
+SELECT * FROM metrics_dist as m
+WHERE EXISTS
+    (SELECT *
+     FROM (SELECT m.time as t
+           FROM metrics_dist a INNER JOIN devices b
+                ON a.device_id = b.device_id
+           LIMIT 50) as subq
+     WHERE subq.t is NULL)
+LIMIT 1;