diff --git a/src/Libs/include/b64/decode.h b/src/Libs/include/b64/decode.h
index e9019f3..aefb7bc 100644
--- a/src/Libs/include/b64/decode.h
+++ b/src/Libs/include/b64/decode.h
@@ -25,7 +25,9 @@ namespace base64
 
 		decoder(int buffersize_in = BUFSIZ)
 		: _buffersize(buffersize_in)
-		{}
+		{
+			base64_init_decodestate(&_state);
+		}
 
 		int decode(char value_in)
 		{
diff --git a/src/Libs/include/b64/encode.h b/src/Libs/include/b64/encode.h
index e7a7035..33848b3 100644
--- a/src/Libs/include/b64/encode.h
+++ b/src/Libs/include/b64/encode.h
@@ -25,7 +25,9 @@ namespace base64
 
 		encoder(int buffersize_in = BUFSIZ)
 		: _buffersize(buffersize_in)
-		{}
+		{
+			base64_init_encodestate(&_state);
+		}
 
 		int encode(char value_in)
 		{