diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 7e98987dad8..61b5ab6d1da 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -354,6 +354,13 @@ dblink_open(PG_FUNCTION_ARGS)
 			DBLINK_RES_INTERNALERROR("begin error");
 		PQclear(res);
 		rconn->newXactForCursor = TRUE;
+		/*
+		 * Since transaction state was IDLE, we force cursor count to
+		 * initially be 0. This is needed as a previous ABORT might
+		 * have wiped out our transaction without maintaining the
+		 * cursor count for us.
+		 */
+		rconn->openCursorCount = 0;
 	}
 
 	/* if we started a transaction, increment cursor count */
diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index 55d2b9e7c4c..f2e364a9423 100644
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -509,7 +509,7 @@ SELECT dblink_close('myconn','rmt_foo_cursor');
 -- this should fail because there is no open transaction
 SELECT dblink_exec('myconn','DECLARE xact_test CURSOR FOR SELECT * FROM foo');
 ERROR:  sql error
-DETAIL:  ERROR:  cursor "xact_test" already exists
+DETAIL:  ERROR:  DECLARE CURSOR may only be used in transaction blocks
 
 -- reset remote transaction state
 SELECT dblink_exec('myconn','ABORT');