diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index d56ece12fb..c865e82187 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -114,8 +114,11 @@ void OculusManager::initSdk() {
 }
 
 void OculusManager::shutdownSdk() {
-    ovrHmd_Destroy(_ovrHmd);
-    ovr_Shutdown();
+    if (_ovrHmd) {
+        ovrHmd_Destroy(_ovrHmd);
+        _ovrHmd = nullptr;
+        ovr_Shutdown();
+    }
 }
 
 void OculusManager::init() {
@@ -124,6 +127,12 @@ void OculusManager::init() {
 #endif
 }
 
+void OculusManager::deinit() {
+#ifdef OVR_DIRECT_MODE
+    shutdownSdk();
+#endif
+}
+
 void OculusManager::connect() {
 #ifndef OVR_DIRECT_MODE
 	initSdk();
diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h
index fe2da31231..4b1bc98fb2 100644
--- a/interface/src/devices/OculusManager.h
+++ b/interface/src/devices/OculusManager.h
@@ -51,6 +51,7 @@ class Text3DOverlay;
 class OculusManager {
 public:
     static void init();
+    static void deinit();
     static void connect();
     static void disconnect();
     static bool isConnected();
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index b4486ceb2b..7d80b077b8 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -112,6 +112,7 @@ int main(int argc, const char* argv[]) {
         exitCode = app.exec();
     }
 
+    OculusManager::deinit();
 #ifdef Q_OS_WIN
     ReleaseMutex(mutex);
 #endif