diff --git a/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go b/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go
index 1ce42c955cc16353628df898262f7b14e1ea5263..516ce1ad6abbafa9d58b1b5e0097f22b8512d77d 100644
--- a/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go
+++ b/src/github.com/turt2live/matrix-media-repo/storage/datastore/datastore.go
@@ -34,16 +34,6 @@ func GetUriForDatastore(dsConf config.DatastoreConfig) string {
 	return ""
 }
 
-func GetDatastoreConfig(ds *types.Datastore) (config.DatastoreConfig, error) {
-	for _, dsConf := range config.Get().DataStores {
-		if dsConf.Type == ds.Type && GetUriForDatastore(dsConf) == ds.Uri {
-			return dsConf, nil
-		}
-	}
-
-	return config.DatastoreConfig{}, errors.New("datastore not found")
-}
-
 func PickDatastore(ctx context.Context, log *logrus.Entry) (*DatastoreRef, error) {
 	// Legacy options first
 	storagePaths := config.Get().Uploads.StoragePaths
@@ -110,7 +100,7 @@ func PickDatastore(ctx context.Context, log *logrus.Entry) (*DatastoreRef, error
 	var targetDsConf config.DatastoreConfig
 	var dsSize int64
 	for _, dsConf := range confDatastores {
-		if !dsConf.Enabled {
+		if !dsConf.Enabled || !dsConf.ForUploads {
 			continue
 		}