diff --git a/resources/config b/resources/config
index 0dbba22..05d4ce0 160000
--- a/resources/config
+++ b/resources/config
@@ -1 +1 @@
-Subproject commit 0dbba2260378c97741528d02a9125836cc697e26
+Subproject commit 05d4ce0e2fdfe836543d51492cd06822eff21975
diff --git a/src/main/main.go b/src/main/main.go
index 0584ff4..60007f4 100644
--- a/src/main/main.go
+++ b/src/main/main.go
@@ -87,8 +87,12 @@ func main() {
 			}
 
 			// If the application starts in single tenant mode then create/update organisation, type, admin logic
-			if loadedConfig.ApplicationMode == config.SingleTenant {
+			switch loadedConfig.ApplicationMode {
+			case config.SingleTenant:
 				SingleTenantConfiguration(loadedConfig)
+			case config.MultiTenant:
+			default:
+				panic("Application mode is mandatory. Specify either 'single-tenant' or 'multi-tenant'.")
 			}
 
 			router := mux.NewRouter()