diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 995f67d266..96370513e8 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -1175,6 +1175,12 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	{
 		/* Use a random nonconflicting name */
 		portal = CreateNewPortal();
+
+		/*
+		 * Make sure the portal doesn't get closed by the user statements we
+		 * execute.
+		 */
+		PinPortal(portal);
 	}
 	else
 	{
@@ -1413,6 +1419,9 @@ SPI_cursor_close(Portal portal)
 	if (!PortalIsValid(portal))
 		elog(ERROR, "invalid portal in SPI cursor operation");
 
+	if (portal->portalPinned)
+		UnpinPortal(portal);
+
 	PortalDrop(portal, false);
 }
 
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index d096f242cd..a326a04fc9 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -5257,12 +5257,6 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
 	/* Fetch loop variable's datum entry */
 	var = (PLpgSQL_variable *) estate->datums[stmt->var->dno];
 
-	/*
-	 * Make sure the portal doesn't get closed by the user statements we
-	 * execute.
-	 */
-	PinPortal(portal);
-
 	/*
 	 * Fetch the initial tuple(s).  If prefetching is allowed then we grab a
 	 * few more rows to avoid multiple trips through executor startup
@@ -5324,8 +5318,6 @@ loop_exit:
 	 */
 	SPI_freetuptable(tuptab);
 
-	UnpinPortal(portal);
-
 	/*
 	 * Set the FOUND variable to indicate the result of executing the loop
 	 * (namely, whether we looped one or more times). This must be set last so