diff --git a/codeweekeu/settings.py b/codeweekeu/settings.py
index 10b254ce..626e6451 100644
--- a/codeweekeu/settings.py
+++ b/codeweekeu/settings.py
@@ -436,7 +436,6 @@
 	u'PY': None,
 	u'QA': None,
 	u'RE': None,
-	u'RS': None,
 	u'RU': None,
 	u'RW': None,
 	u'SA': None,
diff --git a/static/flags/rs.png b/static/flags/rs.png
new file mode 100644
index 00000000..610e45e5
Binary files /dev/null and b/static/flags/rs.png differ
diff --git a/web/tests/test_events_processors.py b/web/tests/test_events_processors.py
index 7c3d6afd..0ea90353 100644
--- a/web/tests/test_events_processors.py
+++ b/web/tests/test_events_processors.py
@@ -367,6 +367,28 @@ def test_create_event_in_kosovo(admin_user, db):
 
 	assert "XK" == test_event.country.code
 
+@pytest.mark.django_db
+def test_create_event_in_serbia(admin_user, db):
+	event_data = {
+		'audience': [3],
+		'theme': [1,2],
+		'contact_person': u'test@example.com',
+		'country': u'RS',
+		'description': u'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\r\ntempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\r\nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\r\nconsequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\r\ncillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\r\nproident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+		'event_url': u'',
+		'location': u'96 Bulevar despota Stefana, Belgrade, Serbia',
+		'organizer': u'RailsGirls Serbia',
+		"creator": admin_user,
+		'start_date': datetime.datetime.now(),
+		'end_date': datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+		'tags': [u'css', u'html', u'web'],
+		'title': u'RailsGirls Serbia',
+	}
+
+	test_event = create_or_update_event(event_id=None, **event_data)
+
+	assert "RS" == test_event.country.code
+
 @pytest.mark.django_db
 def test_scoreboard_counter(admin_user, db):