diff --git a/src/backend/distributed/planner/fast_path_router_planner.c b/src/backend/distributed/planner/fast_path_router_planner.c
index 3bbf7956b..3d9c1cecb 100644
--- a/src/backend/distributed/planner/fast_path_router_planner.c
+++ b/src/backend/distributed/planner/fast_path_router_planner.c
@@ -54,6 +54,8 @@
 
 bool EnableFastPathRouterPlanner = true;
 bool EnableSingShardFastPathPOC = true;
+bool EnableSingShardFastRemotePOC = false;
+
 
 static bool ColumnAppearsMultipleTimes(Node *quals, Var *distributionKey);
 static bool DistKeyInSimpleOpExpression(Expr *clause, Var *distColumn,
@@ -171,6 +173,7 @@ FastPathRouterQuery(Query *query, const char *query_string,
 	bool isFastPath = false;
 	bool isDistributedTable = false;
 	Node *distributionKeyValue = NULL;
+	RangeTblEntry *rangeTableEntry = NULL;
 
 	if (!EnableFastPathRouterPlanner)
 	{
@@ -213,7 +216,7 @@ FastPathRouterQuery(Query *query, const char *query_string,
 		return false;
 	}
 
-	RangeTblEntry *rangeTableEntry = (RangeTblEntry *) linitial(query->rtable);
+	rangeTableEntry = (RangeTblEntry *) linitial(query->rtable);
 	if (rangeTableEntry->rtekind != RTE_RELATION)
 	{
 		return false;
@@ -235,6 +238,9 @@ FastPathRouterQuery(Query *query, const char *query_string,
 	Var *distributionKey = PartitionColumn(distributedTableId, 1);
 	if (!distributionKey)
 	{
+		isDistributedTable = IsCitusTableTypeCacheEntry(cacheEntry,
+														SINGLE_SHARD_DISTRIBUTED) ||
+							 IsCitusTableTypeCacheEntry(cacheEntry, REFERENCE_TABLE);
 		isFastPath = true;
 	}
 
@@ -294,8 +300,9 @@ returnFastPath:
 
 		if (EnableSingShardFastPathPOC)
 		{
+			Assert(rangeTableEntry != NULL);
 			fastPathContext->distTableRte = rangeTableEntry;
-			fastPathContext->delayFastPathPlanning = isDistributedTable;  /*&& !fastPathContext->distributionKeyHasParam; */
+			fastPathContext->delayFastPathPlanning = isDistributedTable;
 
 			/* If the dist key is parameterized the query will use the plan cache (todo: verify) */
 			fastPathContext->clientQueryString = query_string;
diff --git a/src/backend/distributed/planner/multi_router_planner.c b/src/backend/distributed/planner/multi_router_planner.c
index 52a8c2fd3..d8fb2c4ea 100644
--- a/src/backend/distributed/planner/multi_router_planner.c
+++ b/src/backend/distributed/planner/multi_router_planner.c
@@ -2039,7 +2039,7 @@ RouterJobFastPath(DistributedPlanningContext *planContext,
 
 	Query *originalQuery = planContext->originalQuery;
 	bool isMultiShardQuery = false, shardsPresent = false,
-		 distTableWithShardKey = false, isLocalExecution = false;
+		 isLocalExecution = false;
 	Const *partitionKeyValue = NULL;
 	Const *distributionKeyValue = fastPathContext->distributionKeyValue;
 	uint64 shardId = INVALID_SHARD_ID;
@@ -2066,9 +2066,6 @@ RouterJobFastPath(DistributedPlanningContext *planContext,
 	Assert(cacheEntry->relationId == shard->relationId);
 	Assert(IsCitusTableTypeCacheEntry(cacheEntry, DISTRIBUTED_TABLE));
 
-	distTableWithShardKey = HasDistributionKeyCacheEntry(cacheEntry);
-	Assert(distTableWithShardKey);
-
 	List *taskPlacementList = CreateTaskPlacementListForShardIntervals(shardIntervals,
 																	   true, false,
 																	   false);
@@ -2127,12 +2124,19 @@ RouterJobFastPath(DistributedPlanningContext *planContext,
 	}
 	else
 	{
-		SetTaskQueryString(task, (char *) fastPathContext->clientQueryString);
-
 		/* Call fast path query planner, Save plan in planContext->plan */
 		planContext->plan = FastPathPlanner(planContext->originalQuery,
 											planContext->query,
 											planContext->boundParams);
+		if (EnableSingShardFastRemotePOC)
+		{
+			SetTaskQueryString(task, (char *) fastPathContext->clientQueryString);
+		}
+		else
+		{
+			UpdateRelationToShardNames((Node *) job->jobQuery, relationShards);
+			SetTaskQueryIfShouldLazyDeparse(task, job->jobQuery);
+		}
 	}
 	task->anchorShardId = shardId;
 	task->jobId = job->jobId;
@@ -2165,9 +2169,12 @@ ReplaceShardRelationId(Query *query, Oid citusTableOid, Oid shardId)
 	char *shardRelationName = pstrdup(citusTableName);
 	AppendShardIdToName(&shardRelationName, shardId);
 
+	/* construct the schema name */
+	char *schemaName = get_namespace_name(get_rel_namespace(citusTableOid));
+
 	RangeVar shardRangeVar = {
 		.relname = shardRelationName,
-		.schemaname = NULL, /* todo - should initialize this ? get_rel_namespace(shardRelationId), */
+		.schemaname = schemaName,
 		.inh = rte->inh,
 		.relpersistence = RELPERSISTENCE_PERMANENT,
 	};
diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index 823646e26..aeee68b57 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -1366,6 +1366,17 @@ RegisterCitusConfigVariables(void)
 		GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE,
 		NULL, NULL, NULL);
 
+	DefineCustomBoolVariable(
+		"citus.enable_single_shard_poc_remote",
+		gettext_noop("Enables execution shortcuts for single shard "
+					 "queries in the proof of concept mode - remote case."),
+		NULL,
+		&EnableSingShardFastRemotePOC,
+		false,
+		PGC_USERSET,
+		GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE,
+		NULL, NULL, NULL);
+
 	DefineCustomBoolVariable(
 		"citus.enable_single_shard_poc",
 		gettext_noop("Enables execution shortcuts for single shard "
diff --git a/src/include/distributed/multi_router_planner.h b/src/include/distributed/multi_router_planner.h
index 5cfd5a69b..112d4f043 100644
--- a/src/include/distributed/multi_router_planner.h
+++ b/src/include/distributed/multi_router_planner.h
@@ -29,6 +29,7 @@
 extern bool EnableRouterExecution;
 extern bool EnableFastPathRouterPlanner;
 extern bool EnableSingShardFastPathPOC;
+extern bool EnableSingShardFastRemotePOC;
 
 extern bool EnableNonColocatedRouterQueryPushdown;