diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java
index 4a9d0c67f..cb626d54a 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/properties/GuacamoleProperties.java
@@ -87,7 +87,9 @@ public class GuacamoleProperties {
             if (stream == null)
                 throw new IOException("Resource /guacamole.properties not found.");
 
-            properties.load(stream);
+            // Load properties, always close stream
+            try { properties.load(stream); }
+            finally { stream.close(); }
 
         }
         catch (IOException e) {