diff --git a/src/containers/watermark.jsx b/src/containers/watermark.jsx
index 8cc9324b933c6ea5ec3976f0c5084b1310980b3b..d0d60638cfa30fbc286f4a1a750f165d2d5d0fdc 100644
--- a/src/containers/watermark.jsx
+++ b/src/containers/watermark.jsx
@@ -4,6 +4,8 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
 
+import ThrottledPropertyHOC from '../lib/throttled-property-hoc.jsx';
+
 import VM from 'scratch-vm';
 import storage from '../lib/storage';
 import getCostumeUrl from '../lib/get-costume-url';
@@ -16,8 +18,6 @@ class Watermark extends React.Component {
         bindAll(this, [
             'getCostumeData'
         ]);
-        // Asset ID of the current sprite's current costume
-        this.decodedAssetId = null;
     }
 
     getCostumeData () {
@@ -64,6 +64,8 @@ const mapStateToProps = state => {
 
 const ConnectedComponent = connect(
     mapStateToProps
-)(Watermark);
+)(
+    ThrottledPropertyHOC('asset', 500, Watermark)
+);
 
 export default ConnectedComponent;