diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp
index 7dca8c399a..0d0139e1db 100644
--- a/interface/src/DiscoverabilityManager.cpp
+++ b/interface/src/DiscoverabilityManager.cpp
@@ -75,12 +75,12 @@ void DiscoverabilityManager::removeLocation() {
 }
 
 void DiscoverabilityManager::setDiscoverabilityMode(Discoverability::Mode discoverabilityMode) {
-    if (_mode.get() != discoverabilityMode) {
+    if (static_cast<Discoverability::Mode>(_mode.get()) != discoverabilityMode) {
         
         // update the setting to the new value
-        _mode.set(discoverabilityMode);
+        _mode.set(static_cast<int>(discoverabilityMode));
         
-        if (_mode.get() == Discoverability::None) {
+        if (static_cast<int>(_mode.get()) == Discoverability::None) {
             // if we just got set to no discoverability, make sure that we delete our location in DB
             removeLocation();
         }
diff --git a/interface/src/DiscoverabilityManager.h b/interface/src/DiscoverabilityManager.h
index 6d9f912928..1dac7d63eb 100644
--- a/interface/src/DiscoverabilityManager.h
+++ b/interface/src/DiscoverabilityManager.h
@@ -33,13 +33,13 @@ public slots:
     void updateLocation();
     void removeLocation();
     
-    Discoverability::Mode getDiscoverabilityMode() { return _mode.get(); }
+    Discoverability::Mode getDiscoverabilityMode() { return static_cast<Discoverability::Mode>(_mode.get()); }
     void setDiscoverabilityMode(Discoverability::Mode discoverabilityMode);
     
 private:
     DiscoverabilityManager();
     
-    Setting::Handle<Discoverability::Mode> _mode;
+    Setting::Handle<int> _mode;
 };
 
 #endif // hifi_DiscoverabilityManager_h
\ No newline at end of file