diff --git a/src/Model/Attach.php b/src/Model/Attach.php
index 102e7b1a1d..7a04461768 100644
--- a/src/Model/Attach.php
+++ b/src/Model/Attach.php
@@ -6,12 +6,10 @@
  */
 namespace Friendica\Model;
 
-use Friendica\Core\StorageManager;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Storage\IStorage;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
@@ -261,10 +259,9 @@ class Attach
 			$items = self::selectToArray(['backend-class','backend-ref'], $conditions);
 
 			foreach($items as $item) {
-				/** @var IStorage $backend_class */
-				$backend_class = (string)$item['backend-class'];
+				$backend_class = DI::facStorage()->getByName($item['backend-class'] ?? '');
 				if ($backend_class !== '') {
-					$fields['backend-ref'] = $backend_class::put($img->asString(), $item['backend-ref']);
+					$fields['backend-ref'] = $backend_class->put($img->asString(), $item['backend-ref'] ?? '');
 				} else {
 					$fields['data'] = $img->asString();
 				}
@@ -294,10 +291,9 @@ class Attach
 		$items = self::selectToArray(['backend-class','backend-ref'], $conditions);
 
 		foreach($items as $item) {
-			/** @var IStorage $backend_class */
-			$backend_class = (string)$item['backend-class'];
-			if ($backend_class !== '') {
-				$backend_class::delete($item['backend-ref']);
+			$backend_class = DI::facStorage()->getByName($item['backend-class'] ?? '');
+			if ($backend_class !== null) {
+				$backend_class->delete($item['backend-ref'] ?? '');
 			}
 		}
 
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 8df06565bc..b13aaa79aa 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -10,12 +10,10 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\StorageManager;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Storage\IStorage;
 use Friendica\Model\Storage\SystemResource;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;