diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index bba430fe..03f71f39 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -1148,13 +1148,10 @@ namespace SparkleShare {
 #else
             System.Windows.Forms.Application.Exit ();
 
-            // Also kill the SSH_AGENT 
+            // Also kill the SSH_AGENT that we started
             try {
-                // Check if we created the process, if so bring it down. Else leave it running
-                if (!System.Environment.GetEnvironmentVariable ("SSH_AUTH_SOCK").Equals ("unknown")) {
-                    int pid = Int32.Parse (System.Environment.GetEnvironmentVariable ("SSH_AGENT_PID"));
-                    Process.GetProcessById (pid).Kill ();
-                }
+                int pid = Int32.Parse (System.Environment.GetEnvironmentVariable ("SSH_AGENT_PID"));
+                Process.GetProcessById (pid).Kill ();
             } catch (Exception e) {
                 // Handle exception if needed
             }