diff --git a/src/command.cpp b/src/command.cpp
index ba054af15bfbc9a2d807d2d085cb31d51a1ed7f4..b72ec310003ad548e306871766364b0a302d25f8 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -98,7 +98,7 @@ Command Command::fromString(const QString& source)
         // Not yet implemented:
         case Action::queryServerInformation:
         case Action::updateHistogram:
-            return Command();
+            return parseUpdateHistogram(rootobj);
         default:
             return Command();
     }
@@ -250,6 +250,20 @@ Protocol::Command Protocol::Command::parseFillHistogram(const QJsonObject& input
            );
 }
 
+Protocol::Command Protocol::Command::parseUpdateHistogram(const QJsonObject& input)
+{
+    if (!input.keys().contains(QStringLiteral("bincontents")) || !input.value(QStringLiteral("bincontents")).isString()) {
+        logError(QStringLiteral("updateHistogram command does not contain bincontents."));
+        return Command();
+    }
+
+     return Command(
+               Action::updateHistogram,
+               Arguments{std::make_pair(QStringLiteral("bincontents"), input.value(QStringLiteral("bincontents")).toString())},
+               input.value(QStringLiteral("token")).toString()
+           );
+}
+
 QString Command::toString() const
 {
     if (action == Action::invalid)
diff --git a/src/command.h b/src/command.h
index e83a26606283ace8c0752585958da8df85c24d7a..c1b553ff7c356ee79d6866d3b4a19129d74ea37c 100644
--- a/src/command.h
+++ b/src/command.h
@@ -75,6 +75,7 @@ private:
     static Command parseUpdateExperimentState(const QJsonObject& input);
     static Command parseSetTargetState(const QJsonObject& input);
     static Command parseFillHistogram(const QJsonObject& input);
+    static Command parseUpdateHistogram(const QJsonObject& input);
 
     static QString getActionString(const Action action);
 };