diff --git a/wp-includes/js/media-editor.js b/wp-includes/js/media-editor.js
index 9f944acb09..3134a8e91f 100644
--- a/wp-includes/js/media-editor.js
+++ b/wp-includes/js/media-editor.js
@@ -459,10 +459,11 @@
 
 			link: function( embed ) {
 				return media.post( 'send-link-to-editor', {
-					nonce: wp.media.view.settings.nonce.sendToEditor,
-					src:   embed.linkUrl,
-					title: embed.title,
-					html:  wp.media.string.link( embed )
+					nonce:   wp.media.view.settings.nonce.sendToEditor,
+					src:     embed.linkUrl,
+					title:   embed.title,
+					html:    wp.media.string.link( embed ),
+					post_id: wp.media.view.settings.postId
 				}).done( function( resp ) {
 					wp.media.editor.insert( resp );
 				});
diff --git a/wp-includes/js/media-models.js b/wp-includes/js/media-models.js
index 87e64cc298..cce0dc58de 100644
--- a/wp-includes/js/media-models.js
+++ b/wp-includes/js/media-models.js
@@ -235,9 +235,10 @@ window.wp = window.wp || {};
 
 				// Set the action and ID.
 				options.data = _.extend( options.data || {}, {
-					action: 'save-attachment',
-					id:     this.id,
-					nonce:  media.model.settings.saveAttachmentNonce
+					action:  'save-attachment',
+					id:      this.id,
+					nonce:   media.model.settings.saveAttachmentNonce,
+					post_id: media.model.settings.postId
 				});
 
 				// Record the values of the changed attributes.
@@ -268,8 +269,9 @@ window.wp = window.wp || {};
 			var model = this;
 
 			return media.post( 'save-attachment-compat', _.defaults({
-				id:     this.id,
-				nonce:  media.model.settings.saveAttachmentNonce
+				id:      this.id,
+				nonce:   media.model.settings.saveAttachmentNonce,
+				post_id: media.model.settings.postId
 			}, data ) ).done( function( resp, status, xhr ) {
 				model.set( model.parse( resp, xhr ), options );
 			});
@@ -609,7 +611,8 @@ window.wp = window.wp || {};
 				options = options || {};
 				options.context = this;
 				options.data = _.extend( options.data || {}, {
-					action: 'query-attachments'
+					action:  'query-attachments',
+					post_id: media.model.settings.postId
 				});
 
 				// Clone the args so manipulation is non-destructive.
diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index ce701fa578..eb9097ab2b 100644
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -12,6 +12,9 @@
 	media.view.settings = l10n.settings || {};
 	delete l10n.settings;
 
+	// Copy the `postId` setting over to the model settings.
+	media.model.settings.postId = media.view.settings.postId;
+
 	// Check if the browser supports CSS 3.0 transitions
 	$.support.transition = (function(){
 		var style = document.documentElement.style,
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index a688337929..9a82777c34 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -324,6 +324,7 @@ function wp_default_scripts( &$scripts ) {
 		'settings' => array(
 			'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
 			'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
+			'postId'  => 0,
 		),
 	) );