diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 62afd9d931..d76e34c1c9 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -2172,10 +2172,12 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
 
 	global $wp_query;
 	$post_id = 0;
-	if ( 'query' == $context && is_single() )
+	if ( 'query' == $context && is_single() ) {
 		$post_id = $wp_query->get_queried_object_id();
-	elseif ( 'post' == $context )
-		$post_id = $id;
+	} elseif ( 'post' == $context ) {
+		$post = get_post($id);
+		$post_id = $post->ID; 
+	}
 
 	$shortlink = '';