diff --git a/src/freedombone-utils-final b/src/freedombone-utils-final
index 017eaa09..3acda6fa 100755
--- a/src/freedombone-utils-final
+++ b/src/freedombone-utils-final
@@ -40,13 +40,6 @@ function install_final {
     function_check split_gpg_key_into_fragments
     split_gpg_key_into_fragments
 
-    # turn logging off by default
-    if [[ $ONION_ONLY != 'no' ]]; then
-        ${PROJECT_NAME}-logging off --onion
-    else
-        ${PROJECT_NAME}-logging off
-    fi
-
     mark_completed $FUNCNAME
     clear
     echo ''
@@ -75,11 +68,14 @@ function install_final {
             echo ''
             echo $'Shutting down the system. Detatch the ethernet cable, attach wifi dongle, then power on again.'
             echo ''
+            ${PROJECT_NAME}-logging off
             shutdown now
             return
         fi
+        ${PROJECT_NAME}-logging off
         reboot
     fi
+    ${PROJECT_NAME}-logging off
 }
 
 function update_installed_apps_list {