diff --git a/src/Magnum/Trade/AnimationData.cpp b/src/Magnum/Trade/AnimationData.cpp
index 18fbdf1d0..5208ac45a 100644
--- a/src/Magnum/Trade/AnimationData.cpp
+++ b/src/Magnum/Trade/AnimationData.cpp
@@ -70,6 +70,11 @@ UnsignedInt AnimationData::trackTargetId(UnsignedInt id) const {
     return _tracks[id]._targetId;
 }
 
+const Animation::TrackViewStorage<Float>& AnimationData::track(UnsignedInt id) const {
+    CORRADE_ASSERT(id < _tracks.size(), "Trade::AnimationData::track(): index out of range", _tracks[id]._view);
+    return _tracks[id]._view;
+}
+
 template<class V, class R> auto animationInterpolatorFor(Animation::Interpolation interpolation) -> R(*)(const V&, const V&, Float) {
     return Animation::interpolatorFor<V, R>(interpolation);
 }
diff --git a/src/Magnum/Trade/AnimationData.h b/src/Magnum/Trade/AnimationData.h
index d0e7d11a7..f12bb5ea4 100644
--- a/src/Magnum/Trade/AnimationData.h
+++ b/src/Magnum/Trade/AnimationData.h
@@ -326,6 +326,16 @@ class MAGNUM_TRADE_EXPORT AnimationData {
          */
         UnsignedInt trackTargetId(UnsignedInt id) const;
 
+        /**
+         * @brief Track data storage
+         *
+         * Returns the untyped base of a @ref Animation::TrackView, which
+         * allows access only to some track properties. Use the templated and
+         * checked version below to access a concrete @ref Animation::TrackView
+         * type.
+         */
+        const Animation::TrackViewStorage<Float>& track(UnsignedInt id) const;
+
         /**
          * @brief Track data
          * @tparam V    Track value type
@@ -338,7 +348,7 @@ class MAGNUM_TRADE_EXPORT AnimationData {
          * use the view or you need to release the data array using
          * @ref release() and manage its lifetime yourself.
          */
-        template<class V, class R = Animation::ResultOf<V>> Animation::TrackView<Float, V, R> track(UnsignedInt id) const;
+        template<class V, class R = Animation::ResultOf<V>> const Animation::TrackView<Float, V, R>& track(UnsignedInt id) const;
 
         /**
          * @brief Release data storage
@@ -401,11 +411,11 @@ namespace Implementation {
 }
 #endif
 
-template<class V, class R> Animation::TrackView<Float, V, R> AnimationData::track(UnsignedInt id) const {
-    CORRADE_ASSERT(id < _tracks.size(), "Trade::AnimationData::track(): index out of range", (Animation::TrackView<Float, V, R>{}));
-    CORRADE_ASSERT(Implementation::animationTypeFor<V>() == _tracks[id]._type, "Trade::AnimationData::track(): improper type requested for" << _tracks[id]._type, (Animation::TrackView<Float, V, R>{}));
-    CORRADE_ASSERT(Implementation::animationTypeFor<R>() == _tracks[id]._resultType, "Trade::AnimationData::track(): improper result type requested for" << _tracks[id]._resultType, (Animation::TrackView<Float, V, R>{}));
-    return static_cast<const Animation::TrackView<Float, V, R>&>(_tracks[id]._view);
+template<class V, class R> const Animation::TrackView<Float, V, R>& AnimationData::track(UnsignedInt id) const {
+    const Animation::TrackViewStorage<Float>& storage = track(id);
+    CORRADE_ASSERT(Implementation::animationTypeFor<V>() == _tracks[id]._type, "Trade::AnimationData::track(): improper type requested for" << _tracks[id]._type, (static_cast<const Animation::TrackView<Float, V, R>&>(storage)));
+    CORRADE_ASSERT(Implementation::animationTypeFor<R>() == _tracks[id]._resultType, "Trade::AnimationData::track(): improper result type requested for" << _tracks[id]._resultType, (static_cast<const Animation::TrackView<Float, V, R>&>(storage)));
+    return static_cast<const Animation::TrackView<Float, V, R>&>(storage);
 }
 
 }}
diff --git a/src/Magnum/Trade/Test/AnimationDataTest.cpp b/src/Magnum/Trade/Test/AnimationDataTest.cpp
index 06ff6b2dd..006ae5b38 100644
--- a/src/Magnum/Trade/Test/AnimationDataTest.cpp
+++ b/src/Magnum/Trade/Test/AnimationDataTest.cpp
@@ -342,7 +342,7 @@ void AnimationDataTest::trackWrongIndex() {
     data.trackResultType(0);
     data.trackTarget(0);
     data.trackTargetId(0);
-    data.track<Float>(0);
+    data.track(0);
 
     CORRADE_COMPARE(out.str(),
         "Trade::AnimationData::trackType(): index out of range\n"