diff --git a/database.sql b/database.sql
index 6252f80579..8db6c1d6f0 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2020.03-dev (Dalmatian Bellflower)
--- DB_UPDATE_VERSION 1329
+-- DB_UPDATE_VERSION 1330
 -- ------------------------------------------
 
 
diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 20bd937690..49934c63cf 100755
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -34,7 +34,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-	define('DB_UPDATE_VERSION', 1329);
+	define('DB_UPDATE_VERSION', 1330);
 }
 
 return [
diff --git a/update.php b/update.php
index 145446bae0..180cd96ecb 100644
--- a/update.php
+++ b/update.php
@@ -12,6 +12,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
+use Friendica\Model\Storage;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
 
@@ -408,24 +409,30 @@ function update_1327()
 	return Update::SUCCESS;
 }
 
-function update_1329()
+function update_1330()
 {
 	$currStorage = Config::get('storage', 'class', '');
 
 	if (!empty($currStorage)) {
 		$storageName = array_key_first(\Friendica\Core\StorageManager::DEFAULT_BACKENDS, $currStorage);
-		Config::set('storage', 'name', $storageName);
-		Config::delete('storage', 'class');
+		if (!Config::set('storage', 'name', $storageName) ||
+		    !Config::delete('storage', 'class')) {
+			return Update::FAILED;
+		};
 	}
 
-	$photos = DBA::select('photos', ['backend-class', 'id'], ['backend-class IS NOT NULL']);
-	foreach ($photos as $photo) {
-		DBA::update('photos', ['backend-class' => $photo['backend-class']::NAME], ['id' => $photo['id']]);
-	}
+	// Update photos
+	if (!DBA::update('photo', ['backend-class' => Storage\Filesystem::NAME],     ['backend-class' => 'Friendica\Model\Storage\Filesystem']) ||
+	    !DBA::update('photo', ['backend-class' => Storage\Database::NAME],       ['backend-class' => 'Friendica\Model\Storage\Database']) ||
+	    !DBA::update('photo', ['backend-class' => Storage\SystemResource::NAME], ['backend-class' => 'Friendica\Model\Storage\SystemResource'])) {
+		return Update::FAILED;
+	};
 
-	$attachs = DBA::select('attach', ['backend-class', 'id'], ['backend-class IS NOT NULL']);
-	foreach ($attachs as $attach) {
-		DBA::update('photos', ['backend-class' => $attach['backend-class']::NAME], ['id' => $attach['id']]);
+	// update attachments
+	if (!DBA::update('attach', ['backend-class' => Storage\Filesystem::NAME],     ['backend-class' => 'Friendica\Model\Storage\Filesystem']) ||
+	    !DBA::update('attach', ['backend-class' => Storage\Database::NAME],       ['backend-class' => 'Friendica\Model\Storage\Database']) ||
+	    !DBA::update('attach', ['backend-class' => Storage\SystemResource::NAME], ['backend-class' => 'Friendica\Model\Storage\SystemResource'])) {
+		return Update::FAILED;
 	}
 
 	return Update::SUCCESS;