diff --git a/src/libclient/canvas/canvasshortcuts.cpp b/src/libclient/canvas/canvasshortcuts.cpp
index e85f269c19..9ab707d1e3 100644
--- a/src/libclient/canvas/canvasshortcuts.cpp
+++ b/src/libclient/canvas/canvasshortcuts.cpp
@@ -414,7 +414,7 @@ QVector<QVariantMap> CanvasShortcuts::shortcutsToList(const QVariant &shortcuts)
 			QString key = QString::number(i);
 			result.append(map[key].toMap());
 		}
-	} else {
+	} else if(!shortcuts.isNull()) {
 		qWarning("Canvas shortcuts are neither a list nor a map");
 	}
 	return result;