diff --git a/soter/models/__init__.py b/soter/models/__init__.py
index a7d7a23..a12f2bd 100644
--- a/soter/models/__init__.py
+++ b/soter/models/__init__.py
@@ -32,6 +32,10 @@ def fixtures(engine):
                 uuid.UUID('8de98592-76d9-c74d-bb3f-d6184d388b5a'))
     DBSession.add(user)
 
+    no_album = Album('Unclassified', 'Uncategorized images', user, True,
+                     uuid.UUID('1b209cd4-e04e-48ac-a1b0-ec5fdc85b492'), True)
+    DBSession.add(no_album)
+
     roles = [Role('Owner', uuid.UUID('52e08c0c-048a-784f-be10-6e129ad4b5d4'))]
 
     for role in roles:
diff --git a/soter/models/master.py b/soter/models/master.py
index 56b09f8..ce93973 100644
--- a/soter/models/master.py
+++ b/soter/models/master.py
@@ -113,8 +113,8 @@ class Album(Base):
         return DBSession.query(cls).filter(cls.semantic.ilike(semantic)).first()
 
     @classmethod
-    def menu_item(cls):
-        return uuid.UUID('dad46805-f577-4e5b-8073-9b788e0173fc')
+    def no_album(cls):
+        return uuid.UUID('1b209cd4-e04e-48ac-a1b0-ec5fdc85b492')
 
     @classmethod
     def semi(cls):
diff --git a/soter/views/picture.py b/soter/views/picture.py
index 9cf260f..60cf590 100644
--- a/soter/views/picture.py
+++ b/soter/views/picture.py
@@ -36,7 +36,7 @@ def upload(request):
     elif 'album' in request.POST:
         album = Album.by_name(request.POST['album'])
     else:
-        album = None
+        album = Album.by_id(Album.no_album())
     return upload_file(input_file, name, last_modified_date, album, uuid.UUID(authenticated_userid(request)))