Ticket #53765: 53765.2.diff

src/js/media/controllers/featured-image.js

@@ -117 +117 @@
 
                 selection.reset( attachment ? [ attachment ] : [] );
 
-                if ( library.hasMore() ) {
+                if ( ! infinite_scrolling && library.hasMore() ) {
                         library.more();
                 }
         }

src/js/media/controllers/replace-image.js

@@ -104 +104 @@
 
                 selection.reset( attachment ? [ attachment ] : [] );
 
-                if ( library.hasMore() ) {
+                if ( ! infinite_scrolling && library.getTotalAttachments() == 0 && library.hasMore() ) {
                         library.more();
                 }
         }