diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 53cd020cd..12831e7dc 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -99,17 +99,6 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
             }
             it->second->load(esm, id);
 
-            // NOTE: A minor hack/workaround...
-            //
-            // MAO_Containers.esp from Morrowind Acoustic Overhaul has SCVR records
-            // at the end (see Bug #1849). Since OpenMW does not use SCVR subrecords
-            // for variable names just skip these as a quick fix.  An alternative
-            // solution would be to decode and validate SCVR subrecords even if they
-            // appear at the end (in loadscpt.cpp).
-            if (esm.isNextSub("SCVR")) {
-              esm.skipRecord();
-            }
-
             // DELE can also occur after the usual subrecords
             if (esm.isNextSub("DELE")) {
               esm.skipRecord();
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 2e8f31cd2..fff68962f 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -69,6 +69,17 @@ void Script::load(ESMReader &esm)
 
     // Script text
     mScriptText = esm.getHNOString("SCTX");
+
+    // NOTE: A minor hack/workaround...
+    //
+    // MAO_Containers.esp from Morrowind Acoustic Overhaul has SCVR records
+    // at the end (see Bug #1849). Since OpenMW does not use SCVR subrecords
+    // for variable names just skip these as a quick fix.  An alternative
+    // solution would be to decode and validate SCVR subrecords even if they
+    // appear here.
+    if (esm.isNextSub("SCVR")) {
+        esm.skipHSub();
+    }
 }
 void Script::save(ESMWriter &esm) const
 {