diff --git a/lib/app_configuration/bloc/app_configuration_bloc.dart b/lib/app_configuration/bloc/app_configuration_bloc.dart
index 1618ab1..b7a887f 100644
--- a/lib/app_configuration/bloc/app_configuration_bloc.dart
+++ b/lib/app_configuration/bloc/app_configuration_bloc.dart
@@ -57,11 +57,26 @@ class AppConfigurationBloc
     AppConfigurationUpdated event,
     Emitter<AppConfigurationState> emit,
   ) async {
+    if (state.originalRemoteConfig == null) {
+      emit(
+        state.copyWith(
+          status: AppConfigurationStatus.failure,
+          exception: const UnknownException(
+            'Original remote config is not available.',
+          ),
+        ),
+      );
+      return;
+    }
     emit(state.copyWith(status: AppConfigurationStatus.loading));
     try {
+      final configToUpdate = event.remoteConfig.copyWith(
+        createdAt: state.originalRemoteConfig!.createdAt,
+        updatedAt: DateTime.now(),
+      );
       final updatedConfig = await _remoteConfigRepository.update(
-        id: event.remoteConfig.id,
-        item: event.remoteConfig,
+        id: configToUpdate.id,
+        item: configToUpdate,
       );
       emit(
         state.copyWith(
diff --git a/lib/main.dart b/lib/main.dart
index 340698d..d6ca694 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,7 +6,7 @@ import 'package:flutter_news_app_web_dashboard_full_source_code/app/config/confi
 import 'package:flutter_news_app_web_dashboard_full_source_code/bootstrap.dart';
 
 // Define the current application environment (production/development/demo).
-const AppEnvironment appEnvironment = AppEnvironment.demo;
+const AppEnvironment appEnvironment = AppEnvironment.development;
 
 @JS('removeSplashFromWeb')
 external void removeSplashFromWeb();
diff --git a/pubspec.lock b/pubspec.lock
index 835d245..d40ea3f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -90,7 +90,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "7a1b54f8c0f94f6c04af3404c8110181e080b5c4"
+      resolved-ref: f648500814ec636a2930498756029d29b363194a
       url: "https://github.com/flutter-news-app-full-source-code/core.git"
     source: git
     version: "0.0.0"
@@ -269,10 +269,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431
+      sha256: "8b1f37dfaf6e958c6b872322db06f946509433bec3de753c3491a42ae9ec2b48"
       url: "https://pub.dev"
     source: hosted
-    version: "16.0.0"
+    version: "16.1.0"
   google_fonts:
     dependency: "direct main"
     description: