diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index 7a019d06d..110506248 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -998,37 +998,46 @@ class AttributesController extends AppController
     {
         $conditions = $this->__idToConditions($id);
         $conditions['Attribute.type'] = 'attachment';
-        $options = array(
-            'conditions' => $conditions,
-            'includeAllTags' => false,
-            'includeAttributeUuid' => true,
-            'flatten' => true,
-            'deleted' => [0, 1]
-        );
 
         if ($this->_isRest()) {
-            $options['withAttachments'] = true;
+            $options = array(
+                'conditions' => $conditions,
+                'includeAllTags' => false,
+                'includeAttributeUuid' => true,
+                'flatten' => true,
+                'deleted' => [0, 1],
+                'withAttachments' => true,
+            );
+            $attribute = $this->Attribute->fetchAttributes($this->Auth->user(), $options);
+            if (empty($attribute)) {
+                throw new MethodNotAllowedException('Invalid attribute');
+            }
+            $attribute = $attribute[0];
+            if (!$this->Attribute->isImage($attribute['Attribute'])) {
+                throw new NotFoundException("Attribute is not an image.");
+            }
+            return $this->RestResponse->viewData($attribute['Attribute']['data'], $this->response->type());
         }
 
-        $attribute = $this->Attribute->fetchAttributes($this->Auth->user(), $options);
+        $attribute = $this->Attribute->fetchAttributeSimple($this->Auth->user(), [
+            'conditions' => $conditions,
+            'fields' => ['Attribute.id', 'Attribute.event_id', 'Attribute.type', 'Attribute.value'],
+        ]);
         if (empty($attribute)) {
             throw new MethodNotAllowedException('Invalid attribute');
         }
-        $attribute = $attribute[0];
-
         if (!$this->Attribute->isImage($attribute['Attribute'])) {
             throw new NotFoundException("Attribute is not an image.");
         }
 
-        if ($this->_isRest()) {
-            return $this->RestResponse->viewData($attribute['Attribute']['data'], $this->response->type());
-        } else {
-            $width = isset($this->request->params['named']['width']) ? $this->request->params['named']['width'] : 200;
-            $height = isset($this->request->params['named']['height']) ? $this->request->params['named']['height'] : 200;
-            $imageData = $this->Attribute->getPictureData($attribute, $thumbnail, $width, $height);
-            $extension = pathinfo($attribute['Attribute']['value'], PATHINFO_EXTENSION);
-            return new CakeResponse(array('body' => $imageData, 'type' => strtolower($extension)));
-        }
+        $width = isset($this->request->params['named']['width']) ? $this->request->params['named']['width'] : 200;
+        $height = isset($this->request->params['named']['height']) ? $this->request->params['named']['height'] : 200;
+        $imageData = $this->Attribute->getPictureData($attribute, $thumbnail, $width, $height);
+        $extension = pathinfo($attribute['Attribute']['value'], PATHINFO_EXTENSION);
+
+        $this->response->body($imageData);
+        $this->response->type(strtolower($extension));
+        return $this->response;
     }
 
     public function delete($id, $hard = false)
diff --git a/app/Lib/Tools/AttachmentTool.php b/app/Lib/Tools/AttachmentTool.php
index 5f6891023..b18ff9d5a 100644
--- a/app/Lib/Tools/AttachmentTool.php
+++ b/app/Lib/Tools/AttachmentTool.php
@@ -425,8 +425,7 @@ class AttachmentTool
         // Output image to string
         ob_start();
         imagepng($imageThumbnail, null, 9);
-        $imageData = ob_get_contents();
-        ob_end_clean();
+        $imageData = ob_get_clean();
         imagedestroy($imageThumbnail);
 
         return $imageData;
diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index ba3282133..915cec6ac 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -952,7 +952,7 @@ class Attribute extends AppModel
      * @return string
      * @throws Exception
      */
-    public function getPictureData(array $attribute, $thumbnail=false, $maxWidth=200, $maxHeight=200)
+    public function getPictureData(array $attribute, $thumbnail = false, $maxWidth = 200, $maxHeight = 200)
     {
         if ($thumbnail && extension_loaded('gd')) {
             if ($maxWidth == 200 && $maxHeight == 200) {