diff --git a/controllers/albumsController.js b/controllers/albumsController.js
index 7c9c7da..57597ca 100644
--- a/controllers/albumsController.js
+++ b/controllers/albumsController.js
@@ -106,7 +106,7 @@ albumsController.get = async (req, res, next) => {
 	const identifier = req.params.identifier;
 	if (identifier === undefined) return res.status(401).json({ success: false, description: 'No identifier provided' });
 
-	const album = await db.table('albums').where('identifier', identifier).first();
+	const album = await db.table('albums').where({ identifier, enabled: 1 }).first();
 	if (!album) return res.json({ success: false, description: 'Album not found' });
 
 	const title = album.name;
diff --git a/routes/album.js b/routes/album.js
index ab1ddfa..db9dbd0 100644
--- a/routes/album.js
+++ b/routes/album.js
@@ -8,8 +8,8 @@ routes.get('/a/:identifier', async (req, res, next) => {
 	let identifier = req.params.identifier;
 	if (identifier === undefined) return res.status(401).json({ success: false, description: 'No identifier provided' });
 
-	const album = await db.table('albums').where('identifier', identifier).first();
-	if (!album) return res.json({ success: false, description: 'Album not found' });
+	const album = await db.table('albums').where({ identifier, enabled: 1 }).first();
+	if (!album) return res.status(404).sendFile('404.html', { root: './pages/error/' });
 
 	const files = await db.table('files').select('name').where('albumid', album.id).orderBy('id', 'DESC');
 	let thumb = '';