diff --git a/includes/webform.submissions.inc b/includes/webform.submissions.inc
index 0ab2645..0559e1f 100644
--- a/includes/webform.submissions.inc
+++ b/includes/webform.submissions.inc
@@ -667,13 +667,13 @@ function webform_get_submissions($filters = array(), $header = NULL, $pager_coun
 
   // Query the required submission data.
   $query = db_select('webform_submitted_data', 'sd');
-  $query->leftJoin('webform_submissions', 's', 's.sid = sd.sid');
+  $query->rightJoin('webform_submissions', 's', 's.sid = sd.sid');
   $query->leftJoin('users', 'u', 'u.uid = s.uid');
   $query
     ->fields('s')
     ->fields('sd', array('cid', 'no', 'data'))
     ->fields('u', array('name'))
-    ->condition('sd.sid', $sids, 'IN')
+    ->condition('s.sid', $sids, 'IN')
     ->orderBy('sd.sid', 'ASC')
     ->orderBy('sd.cid', 'ASC')
     ->orderBy('sd.no', 'ASC');
@@ -681,7 +681,7 @@ function webform_get_submissions($filters = array(), $header = NULL, $pager_coun
   // By adding the NID to this query we allow MySQL to use the primary key on
   // in webform_submitted_data for sorting (nid_sid_cid_no).
   if (isset($filters['nid'])) {
-    $query->condition('sd.nid', $filters['nid']);
+    $query->condition('s.nid', $filters['nid']);
   }
 
   $result = $query->execute();