diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25fd4731e6..ee5e027473 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# If we're running under the gradle build, HIFI_ANDROID will be set here, but 
+# If we're running under the gradle build, HIFI_ANDROID will be set here, but
 # ANDROID will not be set until after the `project` statement.  This is the *ONLY*
 # place you need to use `HIFI_ANDROID` instead of `ANDROID`
 if (WIN32 AND NOT HIFI_ANDROID)
@@ -61,8 +61,6 @@ else()
 endif()
 option(DISABLE_KTX_CACHE "Disable KTX Cache" OFF)
 
-
-
 set(PLATFORM_QT_GL OpenGL)
 
 if (USE_GLES)
@@ -132,8 +130,8 @@ set_packaging_parameters()
 
 # FIXME hack to work on the proper Android toolchain
 if (ANDROID)
-    add_subdirectory(android/app)
-    return()
+  add_subdirectory(android/app)
+  return()
 endif()
 
 # add subdirectories for all targets
@@ -148,16 +146,18 @@ if (BUILD_SERVER)
 endif()
 
 if (BUILD_CLIENT)
-    add_subdirectory(interface)
-    set_target_properties(interface PROPERTIES FOLDER "Apps")
-    if (ANDROID)
-        add_subdirectory(gvr-interface)
-        set_target_properties(gvr-interface PROPERTIES FOLDER "Apps")
-    endif()
+  add_subdirectory(interface)
+  set_target_properties(interface PROPERTIES FOLDER "Apps")
+  if (ANDROID)
+    add_subdirectory(gvr-interface)
+    set_target_properties(gvr-interface PROPERTIES FOLDER "Apps")
+  endif()
+
+  option(USE_SIXENSE "Build Interface with sixense library/plugin" OFF)
 endif()
 
 if (BUILD_CLIENT OR BUILD_SERVER)
-    add_subdirectory(plugins)
+  add_subdirectory(plugins)
 endif()
 
 # BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 3d33b9929b..76e2ccd181 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -181,7 +181,11 @@ add_dependencies(${TARGET_NAME} resources)
 if (WIN32)
   # These are external plugins, but we need to do the 'add dependency' here so that their
   # binary directories get added to the fixup path
-  add_dependency_external_projects(sixense)
+
+  if (USE_SIXENSE)
+    add_dependency_external_projects(sixense)
+  endif ()
+
   add_dependency_external_projects(sdl2)
   add_dependency_external_projects(OpenVR)
   add_dependency_external_projects(neuron)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 06cf929368..4a0f52e272 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -20,8 +20,12 @@ if (NOT SERVER_ONLY AND NOT ANDROID)
   add_subdirectory(${DIR})
   set(DIR "oculusLegacy")
   add_subdirectory(${DIR})
-  set(DIR "hifiSixense")
-  add_subdirectory(${DIR})
+
+  if (USE_SIXENSE)
+    set(DIR "hifiSixense")
+    add_subdirectory(${DIR})
+  endif()
+  
   set(DIR "hifiSpacemouse")
   add_subdirectory(${DIR})
   set(DIR "hifiNeuron")