diff --git a/Vector/ViewController/MediaAlbumContentViewController.h b/Vector/ViewController/MediaAlbumContentViewController.h
index f16d844bb..987ad6717 100644
--- a/Vector/ViewController/MediaAlbumContentViewController.h
+++ b/Vector/ViewController/MediaAlbumContentViewController.h
@@ -81,5 +81,11 @@
  */
 @property (nonatomic) PHAssetCollection *assetsCollection;
 
+/**
+ A Boolean value that determines whether users can select more than one item.
+ Default is NO.
+ */
+@property (nonatomic) BOOL allowsMultipleSelection;
+
 @end
 
diff --git a/Vector/ViewController/MediaAlbumContentViewController.m b/Vector/ViewController/MediaAlbumContentViewController.m
index a5a7b1fae..26c63ce3e 100644
--- a/Vector/ViewController/MediaAlbumContentViewController.m
+++ b/Vector/ViewController/MediaAlbumContentViewController.m
@@ -87,7 +87,10 @@
         
     }];
 
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"media_picker_select", @"Vector", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onSelect:)];
+    if (_allowsMultipleSelection)
+    {
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringFromTable(@"media_picker_select", @"Vector", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onSelect:)];
+    }
 }
 
 - (void)dealloc