diff --git a/src/core/ScriptLoader.ts b/src/core/ScriptLoader.ts
index 62ded31..3027793 100644
--- a/src/core/ScriptLoader.ts
+++ b/src/core/ScriptLoader.ts
@@ -15,51 +15,60 @@ export class ScriptLoader {
 				});
 			});
 
-			naja.addEventListener('success', (event) => {
-				const {payload} = event.detail;
-				if (payload.snippets) {
-					this.loadScripts(payload.snippets);
-				}
+			naja.snippetHandler.addEventListener('afterUpdate', (event) => {
+				const {content} = event.detail;
+				this.loadScripts(content);
 			});
 		});
 	}
 
-	public loadScripts(snippets: Record<string, string>): void {
-		Object.keys(snippets).forEach((id) => {
-			const content = snippets[id];
-			if ( ! /<script/i.test(content)) {
-				return;
-			}
+	public loadScripts(content: string): void;
+	public loadScripts(snippets: Record<string, string>): void;
+	public loadScripts(snippetsOrSnippet: Record<string, string> | string): void {
+		if (typeof snippetsOrSnippet === 'string') {
+			this.loadScriptsInSnippet(snippetsOrSnippet);
+			return;
+		}
 
-			const el = window.document.createElement('div');
-			el.innerHTML = content;
+		Object.keys(snippetsOrSnippet).forEach((id) => {
+			const content = snippetsOrSnippet[id];
+			this.loadScriptsInSnippet(content);
+		});
+	}
 
-			const scripts = el.querySelectorAll('script');
-			for (let i = 0; i < scripts.length; i++) {
-				const script = scripts.item(i);
-				const scriptId = script.getAttribute('data-naja-script-id');
-				if (scriptId !== null && scriptId !== '' && this.loadedScripts.has(scriptId)) {
-					continue;
-				}
+	private loadScriptsInSnippet(content: string) {
+		if (!/<script/i.test(content)) {
+			return;
+		}
 
-				const scriptEl = window.document.createElement('script');
-				scriptEl.innerHTML = script.innerHTML;
+		const el = window.document.createElement('div');
+		el.innerHTML = content;
 
-				if (script.hasAttributes()) {
-					const attrs = script.attributes;
-					for (let j = 0; j < attrs.length; j++) {
-						const attrName = attrs[j].name;
-						scriptEl.setAttribute(attrName, attrs[j].value);
-					}
-				}
+		const scripts = el.querySelectorAll('script');
+		for (let i = 0; i < scripts.length; i++) {
+			const script = scripts.item(i);
+			const scriptId = script.getAttribute('data-naja-script-id');
+			if (scriptId !== null && scriptId !== '' && this.loadedScripts.has(scriptId)) {
+				continue;
+			}
 
-				window.document.head.appendChild(scriptEl)
-					.parentNode!.removeChild(scriptEl);
+			const scriptEl = window.document.createElement('script');
+			scriptEl.innerHTML = script.innerHTML;
 
-				if (scriptId !== null && scriptId !== '') {
-					this.loadedScripts.add(scriptId);
+			if (script.hasAttributes()) {
+				const attrs = script.attributes;
+				for (let j = 0; j < attrs.length; j++) {
+					const attrName = attrs[j].name;
+					scriptEl.setAttribute(attrName, attrs[j].value);
 				}
 			}
-		});
+
+			window.document.head.appendChild(scriptEl)
+				.parentNode!.removeChild(scriptEl);
+
+			if (scriptId !== null && scriptId !== '') {
+				this.loadedScripts.add(scriptId);
+			}
+		}
 	}
 }
diff --git a/tests/Naja.ScriptLoader.js b/tests/Naja.ScriptLoader.js
index 1bb8dc3..af10c6f 100644
--- a/tests/Naja.ScriptLoader.js
+++ b/tests/Naja.ScriptLoader.js
@@ -4,7 +4,7 @@ import {assert} from 'chai';
 import sinon from 'sinon';
 
 import {ScriptLoader} from '../src/core/ScriptLoader';
-
+import {SnippetHandler} from '../src/core/SnippetHandler';
 
 describe('ScriptLoader', function () {
 	fakeFetch();
@@ -22,18 +22,26 @@ describe('ScriptLoader', function () {
 	});
 
 	it('loads scripts in snippets', function () {
-		const naja = mockNaja();
+		const naja = mockNaja({
+			snippetHandler: SnippetHandler,
+		});
+
+		const foo = document.createElement('div');
+		foo.id = 'snippet--foo';
+		document.body.appendChild(foo);
+
 		const scriptLoader = new ScriptLoader(naja);
 		naja.initialize();
 
 		const mock = sinon.mock(scriptLoader);
 		mock.expects('loadScripts')
-			.withExactArgs({'snippet--foo': 'foo'})
+			.withExactArgs('foo')
 			.once();
 
 		this.fetchMock.respond(200, {'Content-Type': 'application/json'}, {snippets: {'snippet--foo': 'foo'}});
 		return naja.makeRequest('GET', '/ScriptLoader/loadScripts').then(() => {
 			mock.verify();
+			document.body.removeChild(foo);
 		});
 	});