diff --git a/app/lib/consts.dart b/app/lib/consts.dart
index d52c93a1f6e61e3206738ead1e54ab97824593a3..ff51be4528a85120a5f2ee56be5d90e0dc7772c1 100644
--- a/app/lib/consts.dart
+++ b/app/lib/consts.dart
@@ -11,7 +11,6 @@ const int fetchInterval = 60; // Fetch marker data every n minutes
 // Map variables
 LatLng mapCenter = LatLng(60.7666, 10.8471);
 DateTime ?lastUpdate; // Last time data was fetched from server
-bool gServerConnection = false;
 
 // Font variables
 const textColor = Colors.white;
diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index 6259afe5a9c2a725dd09b235a6c494d1c3862d74..028c3f35834046d9f81d227cfde42988d651ed25 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -142,7 +142,11 @@ class _DefaultPageState extends State<DefaultPage> {
                 ),
                 child: ListView(
                   children: [
-                    MapContainerWidget(markerList: markerList, relation: relation),
+                    MapContainerWidget(
+                      markerList: markerList,
+                      relation: relation,
+                      serverConnection: serverConnection,
+                    ),
                   ],
                 ),
               );
diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart
index 77c433ac7bde8a877e908cdd683896fbb8e7fd7c..e51ef19e656289a8f484ca7964b2f3289f1329e0 100644
--- a/app/lib/widgets/main_layout.dart
+++ b/app/lib/widgets/main_layout.dart
@@ -16,10 +16,12 @@ import 'quick_view_chart.dart';
 class MapContainerWidget extends StatefulWidget {
   final List<Measurement> markerList;
   final  Uint8List relation;
+  final bool serverConnection;
 
   const MapContainerWidget({Key? key,
     required this.markerList,
     required this.relation,
+    required this.serverConnection,
   }) : super(key: key);
 
   @override
@@ -279,7 +281,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
                         });
                       },
                       child: Visibility( // Show icon only when no server connection
-                        visible: !gServerConnection,
+                        visible: !widget.serverConnection,
                         child: Container(
                           padding: const EdgeInsets.all(8),
                           decoration: isTapped ? const BoxDecoration(