diff --git a/VERSION.md b/VERSION.md
index a6b318070..47a63812b 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1,5 +1,9 @@
 # Version History
 
+## 4.1.1.8
+
+* Handle potential `NullPointerException` on geofence dismiss
+
 ## 4.1.1.7
 
 * fix KML export for content with more than one item with `null` name
diff --git a/atak/ATAK/app/build.gradle b/atak/ATAK/app/build.gradle
index e298c56ef..90a5a5180 100644
--- a/atak/ATAK/app/build.gradle
+++ b/atak/ATAK/app/build.gradle
@@ -21,7 +21,7 @@ import java.util.regex.Pattern
 ////////////////////////////////////////////////////////////////////////////////
 
 def ATAK_VERSION = "4.1.1"
-def ATAK_VERSION_SUBMINOR = ".7"
+def ATAK_VERSION_SUBMINOR = ".8"
 
 buildscript {
     ext.jacocoVersion = '0.8.5'
diff --git a/atak/ATAK/app/src/main/java/com/atakmap/android/geofence/alert/GeoFenceAlerting.java b/atak/ATAK/app/src/main/java/com/atakmap/android/geofence/alert/GeoFenceAlerting.java
index f0d848c1c..33ef70b66 100644
--- a/atak/ATAK/app/src/main/java/com/atakmap/android/geofence/alert/GeoFenceAlerting.java
+++ b/atak/ATAK/app/src/main/java/com/atakmap/android/geofence/alert/GeoFenceAlerting.java
@@ -346,7 +346,7 @@ public synchronized boolean dismiss(GeoFenceMonitor monitor,
     public synchronized boolean dismiss(GeoFenceMonitor monitor,
             Alert alert, boolean bStopMonitoring) {
         List<Alert> items = _ongoingAlerts.get(monitor);
-        if (alert == null || !items.remove(alert)) {
+        if (FileSystemUtils.isEmpty(items) || alert == null || !items.remove(alert)) {
             Log.w(TAG, "Unable to dismiss alert: " + alert
                     + " for fence: " + monitor.toString());
             return false;