diff --git a/services/web/app/coffee/Features/Analytics/AnalyticsController.coffee b/services/web/app/coffee/Features/Analytics/AnalyticsController.coffee
index 38f5a2e9a4..38029219ee 100644
--- a/services/web/app/coffee/Features/Analytics/AnalyticsController.coffee
+++ b/services/web/app/coffee/Features/Analytics/AnalyticsController.coffee
@@ -7,10 +7,12 @@ module.exports = AnalyticsController =
 	updateEditingSession: (req, res, next) ->
 		userId    = AuthenticationController.getLoggedInUserId(req)
 		projectId = req.params.projectId
+		countryCode = null
 
 		if userId?
 			GeoIpLookup.getDetails req.ip, (err, geoDetails) ->
-				countryCode = geoDetails?.country_code || null
+				if geoDetails?.country_code? and geoDetails.country_code != ""
+					countryCode = geoDetails.country_code
 				AnalyticsManager.updateEditingSession userId, projectId, countryCode, (error) ->
 					respondWith(error, res, next)
 		else