diff --git a/applets/fifteenPuzzle/plugin/fifteenimageprovider.cpp b/applets/fifteenPuzzle/plugin/fifteenimageprovider.cpp
index f2d565413..ee5d0c85a 100644
--- a/applets/fifteenPuzzle/plugin/fifteenimageprovider.cpp
+++ b/applets/fifteenPuzzle/plugin/fifteenimageprovider.cpp
@@ -1,95 +1,101 @@
 /*
  * Copyright 2014 Jeremy Whiting <jpwhiting@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
 #include "fifteenimageprovider.h"
 
 #include <QDebug>
 
 FifteenImageProvider::FifteenImageProvider()
 : QQuickImageProvider(QQuickImageProvider::Pixmap)
 , m_boardSize(4)
 , m_pieceWidth(30)
 , m_pieceHeight(30)
 {
 }
 
 QPixmap FifteenImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
 {
     Q_UNUSED(requestedSize); // wanted sizes are actually encoded in the id
 
     // id format is boardSize-imagenumber-pieceWidth-pieceHeight-imagePath
     qDebug() << "pixmap requested with id " << id;
     QStringList idParts = id.split(QLatin1Char('-'));
-    if (idParts.size() < 4)
+    if (idParts.size() < 4) {
+        *size = QSize();
         return QPixmap();
+    }
 
     bool update = false;
     int boardSize = idParts.at(0).toInt();
     int pieceWidth = idParts.at(2).toInt();
     int pieceHeight = idParts.at(3).toInt();
     QString path = idParts.at(4);
     if (path != m_imagePath && !path.isEmpty()) {
         m_imagePath = path;
         qDebug() << "loading pixmap from file " << path << m_pixmap.load(path);
         update = true;
     }
 
     if (idParts.at(1) == QLatin1String("all")) {
         return m_pixmap;
     } else {
         if (pieceWidth != m_pieceWidth || pieceHeight != m_pieceHeight) {
             m_pieceWidth = pieceWidth;
             m_pieceHeight = pieceHeight;
             update = true;
         }
 
         if (m_boardSize != boardSize) {
             m_boardSize = boardSize;
             update = true;
         }
 
         if (update)
             updatePixmaps();
 
         int number = idParts.at(1).toInt();
 
         qDebug() << "pixmap for piece " << number << " requested";
-        if (number > 0 && number < m_pixmaps.size())
+        if (number > 0 && number < m_pixmaps.size()) {
+            *size = QSize(m_pieceWidth, m_pieceHeight);
             return m_pixmaps.at(number);
+        }
     }
+
+    *size = QSize();
     return QPixmap();
 }
 
 void FifteenImageProvider::updatePixmaps()
 {
     QSize size(m_pieceWidth * m_boardSize, m_pieceHeight * m_boardSize);
     QPixmap copyPixmap = m_pixmap.scaled(size);
 
     m_pixmaps.clear();
     m_pixmaps.resize(m_boardSize * m_boardSize);
 
     for (int i = 0; i < m_boardSize * m_boardSize; i++) {
         int posX = (i % m_boardSize) * m_pieceWidth;
         int posY = (i / m_boardSize) * m_pieceHeight;
 
         m_pixmaps[i] = copyPixmap.copy(posX, posY, m_pieceWidth, m_pieceHeight);
     }
 }