2 files changed, 7 insertions, 7 deletions
diff --git a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
index c78a6ecce..418f932df 100644
--- a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
+++ b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
@@ -1649,6 +1649,10 @@ public class WordPressDB {
                 new String[]{"delete", blogId});
     }
 
+    public boolean hasMediaDeleteQueueItems(int blogId) {
+        return SqlUtils.boolForQuery(db, "SELECT 1 FROM " + MEDIA_TABLE + " WHERE uploadState=? AND blogId=?",
+                new String[]{"delete", Integer.toString(blogId)});
+    }
 
     public int getWPCOMBlogID() {
         int id = -1;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java
index 5565f04d0..df49259cf 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java
@@ -77,13 +77,9 @@ public class MediaBrowserActivity extends WPDrawerActivity implements MediaGridL
         public void onReceive(Context context, Intent intent) {
             if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {
                 // Coming from zero connection. Continue what's pending for delete
-                Blog currentBlog = WordPress.getCurrentBlog();
-
-                if (currentBlog != null) {
-                    String blogId = String.valueOf(currentBlog.getLocalTableBlogId());
-                    if (WordPress.wpDB.getMediaDeleteQueueItems(blogId).getCount() > 0) {
-                        startMediaDeleteService();
-                    }
+                int blogId = WordPress.getCurrentLocalTableBlogId();
+                if (blogId != -1 && WordPress.wpDB.hasMediaDeleteQueueItems(blogId)) {
+                    startMediaDeleteService();
                 }
             }
         }